diff -r 33a5d2bbf6fc -r 73a1feb507fb mmshplugins/mmshaoplugin/tsrc/ut_aoplugin/group/ut_aoplugin.mmp
--- a/mmshplugins/mmshaoplugin/tsrc/ut_aoplugin/group/ut_aoplugin.mmp	Thu Aug 19 09:51:39 2010 +0300
+++ b/mmshplugins/mmshaoplugin/tsrc/ut_aoplugin/group/ut_aoplugin.mmp	Tue Aug 31 15:12:07 2010 +0300
@@ -42,7 +42,15 @@
 SOURCE                  ut_musresourcefinderutil.cpp
 SOURCE                  ut_muscallconferenceeventmonitor.cpp
 SOURCE                  ut_muscallmonitorbase.cpp
-SOURCE                  ut_musclirmonitor.cpp
+SOURCE                  ut_musfactorysettings.cpp
+
+// STUBs for telephonyservice and serviceprovidersettings
+SOURCEPATH              ../Stubs/src
+SOURCE                  ccallinfoiter_stub.cpp 
+SOURCE                  ccallinformation_stub.cpp 
+SOURCE                  spentry_stub.cpp 
+SOURCE                  spsettings_stub.cpp
+
 
 SOURCEPATH              ../../../src
 SOURCE                  musaopluginmain.cpp
@@ -56,7 +64,7 @@
 SOURCE                  muscallstatusmonitor.cpp
 SOURCE                  muscallconferencemonitor.cpp
 SOURCE                  muscallconferenceeventmonitor.cpp
-SOURCE                  musclirmonitor.cpp
+SOURCE                  musvoipcallmonitor.cpp
 
 SOURCEPATH              ../../../../../tsrc/etelstub/src
 SOURCE                  etelstub.cpp
@@ -65,22 +73,23 @@
 SOURCEPATH              ../../../../../tsrc/centralrepositorystub/src
 SOURCE                  centralrepositorystub.cpp
 SOURCEPATH              ../../../../../tsrc/musmanagerstub/src
-SOURCE    		          musmanagerstub.cpp
-SOURCEPATH              ../../../../../tsrc/featmgrstub/src
-SOURCE                  FeatMgr.cpp
+SOURCE    				musmanagerstub.cpp
 
-USERINCLUDE             ../../../../../tsrc/featmgrstub/inc
 USERINCLUDE               ../inc
+USERINCLUDE               ../../../inc
+USERINCLUDE               ../Stubs/inc
 USERINCLUDE               ../../../../../tsrc/propertystub/inc
 USERINCLUDE               ../../../../../tsrc/etelstub/inc
 USERINCLUDE               ../../../../../tsrc/centralrepositorystub/inc
+USERINCLUDE               ../../../../../tsrc/musmanagerstub/inc
 
 SYSTEMINCLUDE             ../../../inc
 SYSTEMINCLUDE             ../../../../../inc
 SYSTEMINCLUDE             ../../../../../tsrc/etelstub/inc
 SYSTEMINCLUDE             ../../../../../tsrc/propertystub/inc
 SYSTEMINCLUDE             ../../../../../tsrc/centralrepositorystub/inc
-SYSTEMINCLUDE		  ../../../../../tsrc/musmanagerstub/inc
+SYSTEMINCLUDE		      ../../../../../tsrc/musmanagerstub/inc
+SYSTEMINCLUDE             /epoc32/include/platform/digia/eunit
 
 APP_LAYER_SYSTEMINCLUDE
 
@@ -90,6 +99,6 @@
 LIBRARY                 euser.lib 
 LIBRARY                 bafl.lib
 LIBRARY                 efsrv.lib
-LIBRARY                 etel3rdparty.lib
+LIBRARY                 charconv.lib
 
 // End of file