# HG changeset patch
# User hgs
# Date 1285925276 -28800
# Node ID 5f6e7f84c9d1701a85910efd4aa078b175742372
# Parent  ed40dc1bd883e864e0f808bed0c404d7c899b35a
201039

diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/aiw_provider_utility_api/tsrc/group/testdomaiwpro.mmp
--- a/classicui_plat/aiw_provider_utility_api/tsrc/group/testdomaiwpro.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/aiw_provider_utility_api/tsrc/group/testdomaiwpro.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -65,8 +65,8 @@
 LIBRARY         euser.lib
 LIBRARY         cone.lib
 LIBRARY         avkon.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         servicehandler.lib
 LIBRARY         eikcoctl.lib
 LIBRARY         eikcore.lib
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/aiw_service_interface_base_api/tsrc/group/testdomserviceib.mmp
--- a/classicui_plat/aiw_service_interface_base_api/tsrc/group/testdomserviceib.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/aiw_service_interface_base_api/tsrc/group/testdomserviceib.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -50,8 +50,8 @@
 
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         ServiceHandler.lib
 
 
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/aiw_service_interface_menu_api/tsrc/group/testdomserviceim.mmp
--- a/classicui_plat/aiw_service_interface_menu_api/tsrc/group/testdomserviceim.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/aiw_service_interface_menu_api/tsrc/group/testdomserviceim.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -50,8 +50,8 @@
 SOURCE          testserviceifmenuprotected.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         ServiceHandler.lib
 
 LANG            SC
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/alarm_api/tsrc/group/testdomalarm.mmp
--- a/classicui_plat/alarm_api/tsrc/group/testdomalarm.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/alarm_api/tsrc/group/testdomalarm.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -49,8 +49,8 @@
 SOURCE          testdomalarmblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY			eiksrv.lib
 LIBRARY			eikalert.lib
 
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/application_switching_api/tsrc/group/testdomapplicationswitching.mmp
--- a/classicui_plat/application_switching_api/tsrc/group/testdomapplicationswitching.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/application_switching_api/tsrc/group/testdomapplicationswitching.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -38,8 +38,8 @@
 SOURCE          testdomserappuiderive.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         eiksrv.lib
 LIBRARY         eiksrvui.lib
 LIBRARY         cone.lib
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/avkon_fonts_api/tsrc/group/testdomakfonts.mmp
--- a/classicui_plat/avkon_fonts_api/tsrc/group/testdomakfonts.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/avkon_fonts_api/tsrc/group/testdomakfonts.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -50,8 +50,8 @@
 SOURCE          testdomakfontsblockslayoutfont.cpp 
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         uiklaf.lib
 LIBRARY         avkon.lib
 LIBRARY         fontutils.lib 
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/avkon_secondary_display_support_api/tsrc/group/testdomasds.mmp
--- a/classicui_plat/avkon_secondary_display_support_api/tsrc/group/testdomasds.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/avkon_secondary_display_support_api/tsrc/group/testdomasds.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -51,8 +51,8 @@
 SOURCE          testdomasdsblocksdata.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         eikdlg.lib 
 LIBRARY         estor.lib 
 LIBRARY         aknnotify.lib
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/avkon_testability_api/tsrc/group/testplattestability.mmp
--- a/classicui_plat/avkon_testability_api/tsrc/group/testplattestability.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/avkon_testability_api/tsrc/group/testplattestability.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -38,8 +38,8 @@
 SOURCE          testplattestabilityblocksakntashook.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         avkon.lib
 LIBRARY         cone.lib 
 
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/avkon_ui_server_api/tsrc/group/testdomuiserver.mmp
--- a/classicui_plat/avkon_ui_server_api/tsrc/group/testdomuiserver.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/avkon_ui_server_api/tsrc/group/testdomuiserver.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -51,8 +51,8 @@
 SOURCE          testdomuiserverblocksakncapserverclient.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         apparc.lib
 LIBRARY         cone.lib
 LIBRARY         eikcore.lib
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/battery_pane_api/tsrc/group/testdombatterypane.mmp
--- a/classicui_plat/battery_pane_api/tsrc/group/testdombatterypane.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/battery_pane_api/tsrc/group/testdombatterypane.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -58,8 +58,8 @@
 SOURCE          testdombpprotectedclass.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         avkon.lib
 LIBRARY         cone.lib 
 
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/custom_cursors_api/tsrc/group/testdomcustomcursors.mmp
--- a/classicui_plat/custom_cursors_api/tsrc/group/testdomcustomcursors.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/custom_cursors_api/tsrc/group/testdomcustomcursors.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -49,8 +49,8 @@
 SOURCE          testdomcustomcursorsblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         avkon.lib
 LIBRARY         gdi.lib
 
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/eikon_server_extension_client_api/tsrc/group/testdomesec.mmp
--- a/classicui_plat/eikon_server_extension_client_api/tsrc/group/testdomesec.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/eikon_server_extension_client_api/tsrc/group/testdomesec.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -49,8 +49,8 @@
 SOURCE          testdomesecblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         avkon.lib
 LIBRARY         cone.lib
 LIBRARY         ws32.lib 
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/emergency_call_support_api/tsrc/group/testdomemergencycallsupport.mmp
--- a/classicui_plat/emergency_call_support_api/tsrc/group/testdomemergencycallsupport.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/emergency_call_support_api/tsrc/group/testdomemergencycallsupport.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -50,8 +50,8 @@
 SOURCE          testdomecsprotectedclass.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         avkon.lib
 LIBRARY         cone.lib 
 
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/extended_aiw_criteria_api/tsrc/group/testdomextaiwcriteria.mmp
--- a/classicui_plat/extended_aiw_criteria_api/tsrc/group/testdomextaiwcriteria.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/extended_aiw_criteria_api/tsrc/group/testdomextaiwcriteria.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -44,8 +44,8 @@
 
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         cone.lib
 LIBRARY         vpbkeng.lib
 LIBRARY         PbkEng.lib
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/extended_animation_api/tsrc/group/testdomextanimation.mmp
--- a/classicui_plat/extended_animation_api/tsrc/group/testdomextanimation.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/extended_animation_api/tsrc/group/testdomextanimation.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -63,8 +63,8 @@
 SOURCE          testdomextanimationcontainer.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         avkon.lib
 LIBRARY         cone.lib
 LIBRARY         fbscli.lib
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/extended_buttons_api/tsrc/group/testdomextbuttons.mmp
--- a/classicui_plat/extended_buttons_api/tsrc/group/testdomextbuttons.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/extended_buttons_api/tsrc/group/testdomextbuttons.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -52,8 +52,8 @@
 SOURCE          testaknview.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         eikcoctl.lib
 LIBRARY         aknicon.lib
 LIBRARY         avkon.lib
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/extended_editors_api/tsrc/group/testdomeditor.mmp
--- a/classicui_plat/extended_editors_api/tsrc/group/testdomeditor.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/extended_editors_api/tsrc/group/testdomeditor.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -68,8 +68,8 @@
 SOURCE          testdomeditorcontainer.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         avkon.lib
 LIBRARY         eikcoctl.lib
 LIBRARY         eikctl.lib
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/extended_grids_api/tsrc/group/testdomgrids.mmp
--- a/classicui_plat/extended_grids_api/tsrc/group/testdomgrids.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/extended_grids_api/tsrc/group/testdomgrids.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -50,8 +50,8 @@
 SOURCE          testdomgridscontainer.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         avkon.lib
 LIBRARY         cone.lib
 LIBRARY         eikcoctl.lib
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/extended_indicators_api/tsrc/group/testdomindicator.mmp
--- a/classicui_plat/extended_indicators_api/tsrc/group/testdomindicator.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/extended_indicators_api/tsrc/group/testdomindicator.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -50,8 +50,8 @@
 SOURCE          testdomindicatorcontainer.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         avkon.lib
 LIBRARY         cone.lib
 
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/extended_initialization_api/tsrc/group/testdomextinit.mmp
--- a/classicui_plat/extended_initialization_api/tsrc/group/testdomextinit.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/extended_initialization_api/tsrc/group/testdomextinit.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -49,8 +49,8 @@
 SOURCE          testdomextinitblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         avkon.LIB
 
 LANG            SC
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/extended_input_capabilities_api/tsrc/group/testdominputcap.mmp
--- a/classicui_plat/extended_input_capabilities_api/tsrc/group/testdominputcap.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/extended_input_capabilities_api/tsrc/group/testdominputcap.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -50,8 +50,8 @@
 SOURCE          testdominputcapext.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         eikctl.lib
 
 
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/extended_lists_api/tsrc/group/testdomlists.mmp
--- a/classicui_plat/extended_lists_api/tsrc/group/testdomlists.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/extended_lists_api/tsrc/group/testdomlists.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -68,8 +68,8 @@
 SOURCE          testdomlistsext.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         avkon.lib
 LIBRARY         cone.lib
 LIBRARY         eikcoctl.lib
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/extended_notes_api/tsrc/group/testdomextnotes.mmp
--- a/classicui_plat/extended_notes_api/tsrc/group/testdomextnotes.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/extended_notes_api/tsrc/group/testdomextnotes.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -49,8 +49,8 @@
 SOURCE          testdomextnotesblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         avkon.lib
 LIBRARY         eikcdlg.lib
 LIBRARY         eikctl.lib
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/extended_notifiers_api/tsrc/group/testdomextnotifiers.mmp
--- a/classicui_plat/extended_notifiers_api/tsrc/group/testdomextnotifiers.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/extended_notifiers_api/tsrc/group/testdomextnotifiers.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -8,7 +8,7 @@
 *
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
-*  Version:   %version: 2.1.2 %
+*  Version:   %version: be1nfmx1#2.1.2.1.1 %
 *
 * Contributors:
 *
@@ -53,8 +53,8 @@
 
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         aknnotifyplugin.lib
 LIBRARY         akndynamicsoftnote.lib
 LIBRARY         aknnotify.lib
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/extended_options_menu_api/tsrc/group/testdomoptionsmenu.mmp
--- a/classicui_plat/extended_options_menu_api/tsrc/group/testdomoptionsmenu.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/extended_options_menu_api/tsrc/group/testdomoptionsmenu.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -42,8 +42,8 @@
 //RESOURCE        resource_file2
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         eikcoctl.lib
 LIBRARY			avkon.lib
 LIBRARY			cone.lib
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/extended_setting_pages_api/tsrc/group/testdomsetpage.mmp
--- a/classicui_plat/extended_setting_pages_api/tsrc/group/testdomsetpage.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/extended_setting_pages_api/tsrc/group/testdomsetpage.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -64,8 +64,8 @@
 SOURCE          testdomsetpageext.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         cone.lib
 LIBRARY         bafl.lib
 LIBRARY         avkon.lib
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/extended_sounds_api/tsrc/group/testplatextsound.mmp
--- a/classicui_plat/extended_sounds_api/tsrc/group/testplatextsound.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/extended_sounds_api/tsrc/group/testplatextsound.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -38,8 +38,8 @@
 SOURCE          testplatextsoundblocksataudioeventapi.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         ATSoundServerClient.lib
 
 LANG            SC
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/extended_status_pane_api/tsrc/group/testdomstatuspane.mmp
--- a/classicui_plat/extended_status_pane_api/tsrc/group/testdomstatuspane.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/extended_status_pane_api/tsrc/group/testdomstatuspane.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -53,8 +53,8 @@
 SOURCE          testdomstatuspaneblockssyncdraw.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         avkon.lib
 LIBRARY         cone.lib
 
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/extended_utilities_api/tsrc/group/testdomextendedutlts.mmp
--- a/classicui_plat/extended_utilities_api/tsrc/group/testdomextendedutlts.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/extended_utilities_api/tsrc/group/testdomextendedutlts.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -49,8 +49,8 @@
 SOURCE          testdomextendedutltsblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         avkon.lib 
 LIBRARY         eikcoctl.lib 
 LIBRARY         eikdlg.lib
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/find_item_ui_api/tsrc/group/testdomfinditem.mmp
--- a/classicui_plat/find_item_ui_api/tsrc/group/testdomfinditem.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/find_item_ui_api/tsrc/group/testdomfinditem.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -66,8 +66,8 @@
 SOURCE          testdomfinditemcontainer.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         cone.lib
 LIBRARY         commonui.lib
 LIBRARY         avkon.lib
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/findutil_api/tsrc/group/testdomfindutil.mmp
--- a/classicui_plat/findutil_api/tsrc/group/testdomfindutil.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/findutil_api/tsrc/group/testdomfindutil.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -39,8 +39,8 @@
 SOURCE          testdomfindutilblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         findutil.lib
 
 LANG            SC
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/generic_parameter_api/tsrc/group/testdomgenparam.mmp
--- a/classicui_plat/generic_parameter_api/tsrc/group/testdomgenparam.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/generic_parameter_api/tsrc/group/testdomgenparam.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -50,8 +50,8 @@
 SOURCE          testdomgenparamext.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         commonui.lib
 LIBRARY         cone.lib
 LIBRARY         eikcore.lib
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/global_popup_priority_controller_api/tsrc/group/testdomgppc.mmp
--- a/classicui_plat/global_popup_priority_controller_api/tsrc/group/testdomgppc.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/global_popup_priority_controller_api/tsrc/group/testdomgppc.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -49,8 +49,8 @@
 SOURCE          testdomgppcblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         avkon.lib
 LIBRARY         cone.lib 
 LIBRARY         ws32.lib 
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/group/bld.inf
--- a/classicui_plat/group/bld.inf	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/group/bld.inf	Fri Oct 01 17:27:56 2010 +0800
@@ -161,6 +161,4 @@
 #include "../information_preview_popup_api/group/bld.inf"
 #include "../intermediate_state_api/group/bld.inf"
 #include "../help_launcher_api/group/bld.inf"
-#include "../common_file_dialogs_api/group/bld.inf"
-#include "../common_file_dialogs_filter_factory_api/group/bld.inf"
 
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/indicator_plugin_api/tsrc/group/testdomindiplugin.mmp
--- a/classicui_plat/indicator_plugin_api/tsrc/group/testdomindiplugin.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/indicator_plugin_api/tsrc/group/testdomindiplugin.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -54,8 +54,8 @@
 SOURCE          testdomindipluginext.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         avkon.lib
 
 LANG            SC
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/input_block_api/tsrc/group/testdominputblk.mmp
--- a/classicui_plat/input_block_api/tsrc/group/testdominputblk.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/input_block_api/tsrc/group/testdominputblk.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -51,8 +51,8 @@
 
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         Avkon.lib
 
 LANG            SC
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/item_finder_api/tsrc/group/testdomitemfinder.mmp
--- a/classicui_plat/item_finder_api/tsrc/group/testdomitemfinder.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/item_finder_api/tsrc/group/testdomitemfinder.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -49,8 +49,8 @@
 SOURCE          testdomitemfinderblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         commonui.lib
 LIBRARY         egul.lib 
 LIBRARY         avkon.lib 
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/key_rotator_api/tsrc/group/testdomkeyrotator.mmp
--- a/classicui_plat/key_rotator_api/tsrc/group/testdomkeyrotator.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/key_rotator_api/tsrc/group/testdomkeyrotator.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -49,8 +49,8 @@
 SOURCE          testdomkeyrotatorblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         aknkeyrotator.lib
 
 LANG            SC
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/layout_configuration_api/tsrc/group/testdomlayoutcfg.mmp
--- a/classicui_plat/layout_configuration_api/tsrc/group/testdomlayoutcfg.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/layout_configuration_api/tsrc/group/testdomlayoutcfg.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -49,8 +49,8 @@
 SOURCE          testdomlayoutcfgblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         avkon.lib
 
 LANG            SC
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/list_effects_api/tsrc/group/testdomlisteffects.mmp
--- a/classicui_plat/list_effects_api/tsrc/group/testdomlisteffects.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/list_effects_api/tsrc/group/testdomlisteffects.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -50,8 +50,8 @@
 SOURCE          testdomlisteffectscontainer.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         cone.lib
 LIBRARY         aknlistloadertfx.lib
 LIBRARY         avkon.lib
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/long_tap_animation_api/tsrc/group/testdomlongtap.mmp
--- a/classicui_plat/long_tap_animation_api/tsrc/group/testdomlongtap.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/long_tap_animation_api/tsrc/group/testdomlongtap.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -49,8 +49,8 @@
 SOURCE          testdomlongtapblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         avkon.lib
 
 LANG            SC
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/media_shared_document_api/tsrc/group/testdommediashareddoc.mmp
--- a/classicui_plat/media_shared_document_api/tsrc/group/testdommediashareddoc.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/media_shared_document_api/tsrc/group/testdommediashareddoc.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -49,8 +49,8 @@
 SOURCE          testdommediashareddocblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         eikcore.lib 
 LIBRARY         apparc.lib
 LIBRARY         cone.lib
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/memory_card_ui_api/tsrc/group/testdommemorycard.mmp
--- a/classicui_plat/memory_card_ui_api/tsrc/group/testdommemorycard.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/memory_card_ui_api/tsrc/group/testdommemorycard.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -49,8 +49,8 @@
 SOURCE          testdommemorycardblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         aknmemorycardui.lib
 
 LANG            SC
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/phone_number_text_utilities_api/tsrc/group/testdomphonecontentutil.mmp
--- a/classicui_plat/phone_number_text_utilities_api/tsrc/group/testdomphonecontentutil.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/phone_number_text_utilities_api/tsrc/group/testdomphonecontentutil.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -49,8 +49,8 @@
 SOURCE          testdomphonecontentutilblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         avkon.lib
 LIBRARY         cone.lib
 LIBRARY         eikcore.lib
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/physics_api/tsrc/group/testplatphysics.mmp
--- a/classicui_plat/physics_api/tsrc/group/testplatphysics.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/physics_api/tsrc/group/testplatphysics.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -40,8 +40,8 @@
 SOURCE          testplatphysicscontrol.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         aknphysics.lib
 LIBRARY         eikcoctl.lib
 LIBRARY         eikctl.lib 
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/pointer_event_modifier_api/tsrc/group/testdompoieventmod.mmp
--- a/classicui_plat/pointer_event_modifier_api/tsrc/group/testdompoieventmod.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/pointer_event_modifier_api/tsrc/group/testdompoieventmod.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -50,8 +50,8 @@
 SOURCE          testdompoieventmodcontainer.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         cone.lib
 LIBRARY         avkon.lib
 LIBRARY         eikcore.lib
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/popup_form_api/tsrc/group/testdompopupform.mmp
--- a/classicui_plat/popup_form_api/tsrc/group/testdompopupform.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/popup_form_api/tsrc/group/testdompopupform.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -65,8 +65,8 @@
 
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         avkon.lib
 LIBRARY         cone.lib
 LIBRARY         eikcoctl.lib
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/server_application_services_api/tsrc/group/testdomserverappservice.mmp
--- a/classicui_plat/server_application_services_api/tsrc/group/testdomserverappservice.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/server_application_services_api/tsrc/group/testdomserverappservice.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -49,8 +49,8 @@
 SOURCE          testdomserverappserviceblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         servicehandler.lib
 LIBRARY         avkon.lib
 LIBRARY         apparc.lib
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/signal_pane_api/tsrc/group/testdomsignalpane.mmp
--- a/classicui_plat/signal_pane_api/tsrc/group/testdomsignalpane.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/signal_pane_api/tsrc/group/testdomsignalpane.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -63,8 +63,8 @@
 SOURCE          testdomsignalprotected.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         avkon.lib
 LIBRARY         cone.lib 
 
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/skinnable_clock_api/tsrc/group/testdomskinnableclock.mmp
--- a/classicui_plat/skinnable_clock_api/tsrc/group/testdomskinnableclock.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/skinnable_clock_api/tsrc/group/testdomskinnableclock.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -50,8 +50,8 @@
 SOURCE          testdomclockcontainer.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         eikcore.lib 
 LIBRARY         commonui.lib 
 LIBRARY         cone.lib 
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/special_character_table_api/tsrc/group/testdomspecialchartab.mmp
--- a/classicui_plat/special_character_table_api/tsrc/group/testdomspecialchartab.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/special_character_table_api/tsrc/group/testdomspecialchartab.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -50,8 +50,8 @@
 SOURCE          testdomcharmap.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         avkon.lib 
 LIBRARY         cone.lib
 LIBRARY         eikcore.lib 
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/stylus_activated_popup_api/tsrc/group/testdomstylusactivepopup.mmp
--- a/classicui_plat/stylus_activated_popup_api/tsrc/group/testdomstylusactivepopup.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/stylus_activated_popup_api/tsrc/group/testdomstylusactivepopup.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -62,8 +62,8 @@
 SOURCE          testdomstylusactivepopupcontainer.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         eikcore.lib
 LIBRARY         bafl.lib
 LIBRARY         avkon.lib
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/task_list_api/tsrc/group/testdomtasklist.mmp
--- a/classicui_plat/task_list_api/tsrc/group/testdomtasklist.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/task_list_api/tsrc/group/testdomtasklist.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -49,8 +49,8 @@
 SOURCE          testdomtasklistblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         cone.lib 
 LIBRARY         avkon.lib
 
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/text_scroller_api/tsrc/group/testdomtextscroller.mmp
--- a/classicui_plat/text_scroller_api/tsrc/group/testdomtextscroller.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/text_scroller_api/tsrc/group/testdomtextscroller.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -50,8 +50,8 @@
 SOURCE          testdomtextscrollercontainer.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         avkon.lib
 LIBRARY         eikcore.lib
 LIBRARY         cone.lib
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/touch_pane_api/tsrc/group/testsdktouchpane.mmp
--- a/classicui_plat/touch_pane_api/tsrc/group/testsdktouchpane.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/touch_pane_api/tsrc/group/testsdktouchpane.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -64,8 +64,8 @@
 SOURCE          testsdktptouchpanefeppen.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         eikcoctl.lib
 LIBRARY         cone.lib
 LIBRARY         avkon.lib
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/transition_effect_parameters_api/tsrc/group/testdomtransitioneffectpara.mmp
--- a/classicui_plat/transition_effect_parameters_api/tsrc/group/testdomtransitioneffectpara.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/transition_effect_parameters_api/tsrc/group/testdomtransitioneffectpara.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -49,8 +49,8 @@
 SOURCE          testdomtransitioneffectparablocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 
 LANG            SC
 
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/transition_effect_utilities_api/tsrc/group/testdomtransitioneffectutilities.mmp
--- a/classicui_plat/transition_effect_utilities_api/tsrc/group/testdomtransitioneffectutilities.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/transition_effect_utilities_api/tsrc/group/testdomtransitioneffectutilities.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -53,8 +53,8 @@
 SOURCE          testdomutilitiescontainer.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         apparc.lib
 LIBRARY         cone.lib
 LIBRARY         eikcore.lib
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 classicui_plat/volume_popup_api/tsrc/group/testdomvolumepopup.mmp
--- a/classicui_plat/volume_popup_api/tsrc/group/testdomvolumepopup.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/classicui_plat/volume_popup_api/tsrc/group/testdomvolumepopup.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -50,8 +50,8 @@
 SOURCE          testdomvolumepopupcontainer.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
+LIBRARY         StifTestInterface.lib
+LIBRARY         StifTestEngine.lib
 LIBRARY         avkon.lib
 LIBRARY         cone.lib 
 LIBRARY         fbscli.lib 
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 commonuis/CommonUi/src/DocGameHandler.cpp
--- a/commonuis/CommonUi/src/DocGameHandler.cpp	Wed Sep 29 10:43:28 2010 +0800
+++ b/commonuis/CommonUi/src/DocGameHandler.cpp	Fri Oct 01 17:27:56 2010 +0800
@@ -90,6 +90,7 @@
     {
     RFile file;
     User::LeaveIfError( file.Open( iFs, aFilename, EFileRead ) );
+    CleanupClosePushL( file );
     RFileReadStream reader( file );    
     iGameId = reader.ReadInt32L();
     reader.ReadInt8L();             // Data Type
@@ -100,7 +101,7 @@
         reader.ReadL( iDestFile, size );// Name String
         }
     reader.Close();
-    file.Close();
+    CleanupStack::PopAndDestroy( &file );
     }
     
 // TODO: Does this method work, how to test this?    
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 commonuis/group/bld.inf
--- a/commonuis/group/bld.inf	Wed Sep 29 10:43:28 2010 +0800
+++ b/commonuis/group/bld.inf	Fri Oct 01 17:27:56 2010 +0800
@@ -16,4 +16,3 @@
 */
 
 #include "../CommonUi/group/bld.inf"
-#include "../CommonDialogs/group/bld.inf"
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 package_definition.xml
--- a/package_definition.xml	Wed Sep 29 10:43:28 2010 +0800
+++ b/package_definition.xml	Fri Oct 01 17:27:56 2010 +0800
@@ -277,10 +277,6 @@
     <unit bldFile="classicui_plat/layout_configuration_api/group" filter="!test"/>
     <unit bldFile="classicui_plat/layout_configuration_api/tsrc/group" filter="test,api_test"/>
    </component>
-   <component id="common_file_dialogs_filter_factory_api" name="Common File Dialogs Filter Factory API" class="api" filter="s60,build_as_app">
-    <meta rel="Api" href="classicui_plat/common_file_dialogs_filter_factory_api/common_file_dialogs_filter_factory_api.metaxml"/>
-    <unit bldFile="classicui_plat/common_file_dialogs_filter_factory_api/group"/>
-   </component>
    <component id="avkon_anim_dll_api" name="AVKON Anim DLL API" class="api" filter="s60,build_as_app">
     <meta rel="Api" href="classicui_plat/avkon_anim_dll_api/avkon_anim_dll_api.metaxml"/>
     <unit bldFile="classicui_plat/avkon_anim_dll_api/group"/>
@@ -422,10 +418,6 @@
     <unit bldFile="classicui_plat/editors_api/group" filter="!test"/>
     <unit bldFile="classicui_plat/editors_api/tsrc/group" filter="test,api_test"/>
    </component>
-   <component id="common_file_dialogs_api" name="Common File Dialogs API" class="api" filter="s60,build_as_app">
-    <meta rel="Api" href="classicui_plat/common_file_dialogs_api/common_file_dialogs_api.metaxml"/>
-    <unit bldFile="classicui_plat/common_file_dialogs_api/group"/>
-   </component>
    <component id="dialog_shutter_api" name="Dialog Shutter API" class="api" filter="s60,build_as_app">
     <meta rel="Api" href="classicui_plat/dialog_shutter_api/dialog_shutter_api.metaxml"/>
     <unit bldFile="classicui_plat/dialog_shutter_api/group" filter="!test"/>
@@ -703,9 +695,6 @@
    <component id="commonui" filter="s60,build_as_app" name="Common UI">
     <unit bldFile="commonuis/commonui/group"/>
    </component>
-   <component id="commondialogs" filter="s60,build_as_app" name="Common Dialogs">
-    <unit bldFile="commonuis/commondialogs/group"/>
-   </component>
   </collection>
   <collection id="applicationinterworkingfw" name="Application Interworking Framework" level="generic">
    <component id="aifwservicehandler" filter="s60,build_as_app" name="Application Interworking Service Handler">
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 uifw/AknGlobalUI/AknCapServer/group/AknCapServer.mmp
--- a/uifw/AknGlobalUI/AknCapServer/group/AknCapServer.mmp	Wed Sep 29 10:43:28 2010 +0800
+++ b/uifw/AknGlobalUI/AknCapServer/group/AknCapServer.mmp	Fri Oct 01 17:27:56 2010 +0800
@@ -120,9 +120,6 @@
 MACRO           WCPLOG
 #endif
 
-#ifdef SYMBIAN_BUILD_GCE
-LIBRARY         goommonitor.lib
-#endif // SYMBIAN_BUILD_GCE
 
 START RESOURCE AknCapServer_reg.rss
 // Do not change the UID below.
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 uifw/AknGlobalUI/AknCapServer/src/AknCapServerEntry.cpp
--- a/uifw/AknGlobalUI/AknCapServer/src/AknCapServerEntry.cpp	Wed Sep 29 10:43:28 2010 +0800
+++ b/uifw/AknGlobalUI/AknCapServer/src/AknCapServerEntry.cpp	Fri Oct 01 17:27:56 2010 +0800
@@ -19,6 +19,7 @@
 #include <uikon/eikdefconst.h>
 #include <uikon/eikenvinterface.h>
 #endif
+#include <e32uid.h>
 #include <eikstart.h>
 #include <AknDef.h>
 #include <barsread.h>
@@ -73,10 +74,6 @@
     #include <akntranseffect.h> // for Transition effect enumerations
 #endif
 
-#ifdef SYMBIAN_BUILD_GCE
-    #include <goommonitor.h>
-#endif 
-
 
 #ifdef RD_INTELLIGENT_TEXT_INPUT
 #include <AvkonInternalCRKeys.h>
@@ -231,11 +228,33 @@
     me->iEikSrv.Close(); // currently there is no use to keep this session alive.
 
 #ifdef SYMBIAN_BUILD_GCE
-   TRAP( err, CreateGOOMWatcherThreadL());
-   if (err != KErrNone)
-       {
-       RDebug::Print(_L("Creating out of graphics mem thread failed with err %d"), err);
-       }
+    const TInt KOOMWatcherDllUid = 0x10282DBF;
+    _LIT(KOOMWatcherDll, "goommonitor.dll");
+
+    RLibrary lib; // we don't need to push to stack because there is no leaving in following operations.
+    TUidType uidType(KDynamicLibraryUid, KSharedLibraryUid, TUid::Uid(KOOMWatcherDllUid));
+
+    err = lib.Load(KOOMWatcherDll, uidType);
+    if (KErrNone == err)
+        {
+        TLibraryFunction func = lib.Lookup(2); /* CreateGOOMWatcherThreadL */
+        if (func)
+            {
+            TRAP(err, (*func)());
+            if (err != KErrNone)
+                {
+                RDebug::Print(_L("Creating out of graphics mem thread in capserver failed with err %d"), err);
+                }
+            }
+        else
+            {
+            RDebug::Print(_L("Lookup function entry in goommonitor.dll return NULL, the entry number may be wrong!"));
+            }
+        }
+    else
+        {
+        RDebug::Print(_L("Dynamically Loading goommonitor.dll failed with err %d, it's ok!"), err);
+        }
 #endif 
 
     return err;
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 uifw/AvKon/aknphysics/group/bld.inf
--- a/uifw/AvKon/aknphysics/group/bld.inf	Wed Sep 29 10:43:28 2010 +0800
+++ b/uifw/AvKon/aknphysics/group/bld.inf	Fri Oct 01 17:27:56 2010 +0800
@@ -26,7 +26,7 @@
 
 // Generic configuration interface for component cenrep settings  
 ../cenrep/20021192.txt                     /epoc32/winscw/c/private/10202be9/20021192.txt
-../cenrep/20021192.txt                     /epoc32/data/Z/private/10202BE9/20021192.txt
+../cenrep/20021192.txt                     /epoc32/data/z/private/10202BE9/20021192.txt
 ../conf/s60/aknphysics.confml             APP_LAYER_CONFML(aknphysics.confml)
 ../conf/s60/aknphysics_20021192.crml      APP_LAYER_CRML(aknphysics_20021192.crml)
 
diff -r ed40dc1bd883 -r 5f6e7f84c9d1 uifw/AvKon/group/bld.inf
--- a/uifw/AvKon/group/bld.inf	Wed Sep 29 10:43:28 2010 +0800
+++ b/uifw/AvKon/group/bld.inf	Fri Oct 01 17:27:56 2010 +0800
@@ -102,7 +102,7 @@
 OPTION TARGETFILE Avkon2mifheader_inst.cpp
 OPTION GENPATH ../Avkon2MifHeader
 OPTION MIFFILE avkon2.mif
-// OPTION MIFDIR armv5 uses $(EPOCROOT)epoc32/data/Z/resource/apps and for winscw uses $(EPOCROOT)epoc32/release/winscw/$(CFG)/z/resource/apps
+// OPTION MIFDIR armv5 uses $(EPOCROOT)epoc32/data/z/resource/apps and for winscw uses $(EPOCROOT)epoc32/release/winscw/$(CFG)/z/resource/apps
 OPTION DLLNAME Avkon2MifHeader
 OPTION DLLUID 0x102827CF
 END