Revision: 200917 PDK_2.0.a
authorKiiskinen Klaus (Nokia-D-MSW/Tampere) <klaus.kiiskinen@nokia.com>
Fri, 08 May 2009 08:20:08 +0300
changeset 1 a36b1e19a461
parent 0 14df0fbfcc4e
child 2 e016a6bab8e4
child 5 989d2f495d90
Revision: 200917 Kit: 200918
install/serviceapi.pkg
sapi_applicationmanager/tsrc/dev/tappmanagerprovidertest/group/bld.inf
sapi_applicationmanager/tsrc/dev/tappmanagerprovidertest/group/tappmanagerprovidertest.pkg
sapi_applicationmanager/tsrc/dev/tappmanagerprovidertest/group/tprovidertest.pkg
sapi_applicationmanager/tsrc/dev/tappmanagertest/group/bld.inf
sapi_applicationmanager/tsrc/dev/tappmanagertest/group/tappmanagertest.pkg
sapi_applicationmanager/tsrc/dev/tappmanagertest/group/tprovidertest.pkg
sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/group/bld.inf
sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/group/tappmanprovidernegativetest.pkg
sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/group/tprovidertest.pkg
sapi_applicationmanager/tsrc/dev/testappmngui/group/bld.inf
sapi_applicationmanager/tsrc/dev/testappmngui/group/testappmngui.pkg
sapi_applicationmanager/tsrc/testing/tappmgrprovider/group/tappmgrprovider.pkg
sapi_applicationmanager/tsrc/testing/tappmgrprovider/group/tprovidertest.pkg
sapi_applicationmanager/tsrc/testing/tappmgrtest/group/tappmgrtest.pkg
sapi_applicationmanager/tsrc/testing/tappmgrtest/group/tprovidertest.pkg
sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/group/bld.inf
sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/group/tcalendaradditer3.pkg
sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarchangenotifyiter3/group/bld.inf
sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarchangenotifyiter3/group/tcalendarchangenotifyiter3.pkg
sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/group/bld.inf
sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/group/tcalendardeleteiter3.pkg
sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarexportiter3/group/bld.inf
sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarexportiter3/group/tcalendarexportiter3.pkg
sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/group/bld.inf
sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/group/tcalendargenerictest.pkg
sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargetlistiter3/group/bld.inf
sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargetlistiter3/group/tcalendargetlistiter3.pkg
sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarimportiter3/group/bld.inf
sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarimportiter3/group/tcalendarimportiter3.pkg
sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarupdateiter3/group/bld.inf
sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarupdateiter3/group/tcalendarupdateiter3.pkg
sapi_calendar/tsrc/dev/tcalendartest/tcalendaradditer1/group/bld.inf
sapi_calendar/tsrc/dev/tcalendartest/tcalendaradditer1/group/tcalendaradditer1.pkg
sapi_calendar/tsrc/dev/tcalendartest/tcalendarchangenotifyiter1/group/bld.inf
sapi_calendar/tsrc/dev/tcalendartest/tcalendarchangenotifyiter1/group/tcalendarchangenotifyiter1.pkg
sapi_calendar/tsrc/dev/tcalendartest/tcalendardeleteiter1/group/bld.inf
sapi_calendar/tsrc/dev/tcalendartest/tcalendardeleteiter1/group/tcalendardeleteiter1.pkg
sapi_calendar/tsrc/dev/tcalendartest/tcalendarexportiter1/group/bld.inf
sapi_calendar/tsrc/dev/tcalendartest/tcalendarexportiter1/group/tcalendarexportiter1.pkg
sapi_calendar/tsrc/dev/tcalendartest/tcalendargetlistiter1/group/bld.inf
sapi_calendar/tsrc/dev/tcalendartest/tcalendargetlistiter1/group/tcalendargetlistiter1.pkg
sapi_calendar/tsrc/dev/tcalendartest/tcalendarimportiter1/group/bld.inf
sapi_calendar/tsrc/dev/tcalendartest/tcalendarimportiter1/group/tcalendarimportiter1.pkg
sapi_calendar/tsrc/dev/tcalendartest/tcalendarupdateiter1/group/bld.inf
sapi_calendar/tsrc/dev/tcalendartest/tcalendarupdateiter1/group/tcalendarupdateiter1.pkg
sapi_calendar/tsrc/testing/tcal_providertest/group/bld.inf
sapi_calendar/tsrc/testing/tcal_providertest/group/tcal_providertest.pkg
sapi_calendar/tsrc/testing/tcalendarservice/tcal_add/group/bld.inf
sapi_calendar/tsrc/testing/tcalendarservice/tcal_add/group/tcal_add.pkg
sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/group/bld.inf
sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/group/tcal_changenotify.pkg
sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/group/bld.inf
sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/group/tcal_delete.pkg
sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/group/bld.inf
sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/group/tcal_export.pkg
sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/group/bld.inf
sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/group/tcal_getlist.pkg
sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/group/bld.inf
sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/group/tcal_import.pkg
sapi_calendar/tsrc/testing/tcalendarservice/tcal_update/group/bld.inf
sapi_calendar/tsrc/testing/tcalendarservice/tcal_update/group/tcal_update.pkg
sapi_calendar/tsrc/testing/tcalprovider_combined/group/bld.inf
sapi_calendar/tsrc/testing/tcalprovider_combined/group/tcalprovider_combined.pkg
sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest/group/bld.inf
sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest/group/tcontactprovidertest.pkg
sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest_sync/group/bld.inf
sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest_sync/group/tcontactprovidertest_sync.pkg
sapi_contacts_vpbk/tsrc/dev/tcontacts_async/group/bld.inf
sapi_contacts_vpbk/tsrc/dev/tcontacts_async/group/tcontacts_async.pkg
sapi_contacts_vpbk/tsrc/dev/tcontacts_sim/group/bld.inf
sapi_contacts_vpbk/tsrc/dev/tcontacts_sim/group/tcontacts_sim.pkg
sapi_contacts_vpbk/tsrc/dev/tcontacts_sync/group/bld.inf
sapi_contacts_vpbk/tsrc/dev/tcontacts_sync/group/tcontacts_sync.pkg
sapi_contacts_vpbk/tsrc/dev/tcontactsprovidetest_sim/group/bld.inf
sapi_contacts_vpbk/tsrc/dev/tcontactsprovidetest_sim/group/tcontactsprovider_sim.pkg
sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/group/bld.inf
sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/group/tprovidertest_vpbk.pkg
sapi_contacts_vpbk/tsrc/testing/tcontact_add/group/bld.inf
sapi_contacts_vpbk/tsrc/testing/tcontact_add/group/tcontact_add.pkg
sapi_contacts_vpbk/tsrc/testing/tcontact_delete/group/bld.inf
sapi_contacts_vpbk/tsrc/testing/tcontact_delete/group/tcontact_delete.pkg
sapi_contacts_vpbk/tsrc/testing/tcontact_edit/group/bld.inf
sapi_contacts_vpbk/tsrc/testing/tcontact_edit/group/tcontact_edit.pkg
sapi_contacts_vpbk/tsrc/testing/tcontact_export/group/bld.inf
sapi_contacts_vpbk/tsrc/testing/tcontact_export/group/tcontact_export.pkg
sapi_contacts_vpbk/tsrc/testing/tcontact_getlist/group/bld.inf
sapi_contacts_vpbk/tsrc/testing/tcontact_getlist/group/tcontact_getlist.pkg
sapi_contacts_vpbk/tsrc/testing/tcontact_import/group/bld.inf
sapi_contacts_vpbk/tsrc/testing/tcontact_import/group/tcontact_import.pkg
sapi_contacts_vpbk/tsrc/testing/tcontact_organise/group/bld.inf
sapi_contacts_vpbk/tsrc/testing/tcontact_organise/group/tcontact_organise.pkg
sapi_landmarks/tsrc/dev/landmarks_inputparams/group/bld.inf
sapi_landmarks/tsrc/dev/landmarks_inputparams/group/landmarks_inputparams.pkg
sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlandmarkprovider/group/bld.inf
sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlandmarkprovider/group/tlandmarkprovider.pkg
sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlmprovidercategorytests/group/bld.inf
sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlmprovidercategorytests/group/tlmprovidercategorytests.pkg
sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlmproviderdbtests/group/bld.inf
sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlmproviderdbtests/group/tlmproviderdbtests.pkg
sapi_landmarks/tsrc/dev/tlandmarkstest/tlmcategorytests/group/bld.inf
sapi_landmarks/tsrc/dev/tlandmarkstest/tlmcategorytests/group/tlmcategorytests.pkg
sapi_landmarks/tsrc/dev/tlandmarkstest/tlmdatabasetests/group/bld.inf
sapi_landmarks/tsrc/dev/tlandmarkstest/tlmdatabasetests/group/tlmdatabasetests.pkg
sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/group/bld.inf
sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/group/tlmlandmarktests.pkg
sapi_landmarks/tsrc/testing/tlandmark_provider/group/bld.inf
sapi_landmarks/tsrc/testing/tlandmark_provider/group/tlandmark_provider.pkg
sapi_landmarks/tsrc/testing/tproviderlmarktest/group/bld.inf
sapi_landmarks/tsrc/testing/tproviderlmarktest/group/tproviderlmarktest.pkg
sapi_location/tsrc/dev/tlocationprovidertest/group/bld.inf
sapi_location/tsrc/dev/tlocationprovidertest/group/tlocationprovidertest.pkg
sapi_location/tsrc/dev/tlocmanualtest/group/tlocmanualtest.pkg
sapi_location/tsrc/dev/tlocservicetest/group/bld.inf
sapi_location/tsrc/dev/tlocservicetest/group/tlocservicetest.pkg
sapi_location/tsrc/testing/performance/pgetbearing/group/getbearing.pkg
sapi_location/tsrc/testing/performance/pgetdistance/group/getdistperf.pkg
sapi_location/tsrc/testing/tlocmanualtest/group/tlocmanualtest.pkg
sapi_location/tsrc/testing/tloctest/group/tloctest.pkg
sapi_location/tsrc/testing/tprovidertest/group/tprovidertest.pkg
sapi_location/tsrc/testing/tsapiloctest/group/bld.inf
sapi_location/tsrc/testing/tsapiloctest/group/tsapiloctest.pkg
sapi_location/tsrc/testing/tsapiloctotest/group/bld.inf
sapi_location/tsrc/testing/tsapiloctotest/group/tsapiloctotest.pkg
sapi_logging/tsrc/dev/tloggingprovidertest/group/bld.inf
sapi_logging/tsrc/dev/tloggingprovidertest/group/tloggingprovidertest.pkg
sapi_logging/tsrc/dev/tloggingservice/group/bld.inf
sapi_logging/tsrc/dev/tloggingservice/group/tloggingservice.pkg
sapi_logging/tsrc/dev/tlogtypeidtest/group/bld.inf
sapi_logging/tsrc/dev/tlogtypeidtest/group/tlogtypeidtest.pkg
sapi_logging/tsrc/testing/tloggingservicetest/group/bld.inf
sapi_logging/tsrc/testing/tloggingservicetest/group/tloggingservicetest.pkg
sapi_logging/tsrc/testing/tlogprovidertest/group/bld.inf
sapi_logging/tsrc/testing/tlogprovidertest/group/tlogprovidertest.pkg
sapi_mediamanagement/tsrc/dev/taiwmediamgmttest/group/bld.inf
sapi_mediamanagement/tsrc/dev/taiwmediamgmttest/group/taiwmediamgmttest.pkg
sapi_mediamanagement/tsrc/dev/tmediamgmtprovidertest/group/bld.inf
sapi_mediamanagement/tsrc/dev/tmediamgmtprovidertest/group/tmediamgmtprovidertest.pkg
sapi_mediamanagement/tsrc/dev/tmediamgmttest/group/bld.inf
sapi_mediamanagement/tsrc/dev/tmediamgmttest/group/tmediamgmttest.pkg
sapi_mediamanagement/tsrc/testing/performance/runtime_perf/group/bld.inf
sapi_mediamanagement/tsrc/testing/performance/s60_perf/group/bld.inf
sapi_mediamanagement/tsrc/testing/tmediaprovidertest/group/bld.inf
sapi_mediamanagement/tsrc/testing/tmediaprovidertest/group/tmediaprovidertest.pkg
sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/group/Bld.inf
sapi_messaging/tsrc/dev/group/bld.inf
sapi_messaging/tsrc/dev/group/messaging_mannual.pkg
sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/group/bld.inf
sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/group/tmsg_notificationiter3.pkg
sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_changestatusiter3/group/bld.inf
sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_changestatusiter3/group/tmsg_changestatusiter3.pkg
sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_deletemessageiter3/group/bld.inf
sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_deletemessageiter3/group/tmsg_deletemessageiter3.pkg
sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/group/bld.inf
sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/group/tmsg_getheaderlistiter3.pkg
sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_misccases/group/bld.inf
sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_misccases/group/tmsg_misccases.pkg
sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/group/bld.inf
sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/group/tmsg_negitivecases.pkg
sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_sendmessageiter3/group/bld.inf
sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_sendmessageiter3/group/tmsg_sendmessageiter3.pkg
sapi_messaging/tsrc/dev/tmessagingtest/manual/tmsg_notificationiter1/group/bld.inf
sapi_messaging/tsrc/dev/tmessagingtest/manual/tmsg_notificationiter1/group/tmsg_notificationiter1.pkg
sapi_messaging/tsrc/dev/tmessagingtest/tmsg_changestatusiter1/group/bld.inf
sapi_messaging/tsrc/dev/tmessagingtest/tmsg_changestatusiter1/group/tmsg_changestatusiter1.pkg
sapi_messaging/tsrc/dev/tmessagingtest/tmsg_deletemessageiter1/group/bld.inf
sapi_messaging/tsrc/dev/tmessagingtest/tmsg_deletemessageiter1/group/tmsg_deletemessageiter1.pkg
sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/group/bld.inf
sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/group/tmsg_getheaderlistiter1.pkg
sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/group/bld.inf
sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/group/tmsg_sendmessageiter1.pkg
sapi_messaging/tsrc/testing/group/bld.inf
sapi_messaging/tsrc/testing/group/testing.pkg
sapi_messaging/tsrc/testing/performance/asyncsend/group/bld.inf
sapi_messaging/tsrc/testing/performance/delete/group/bld.inf
sapi_messaging/tsrc/testing/performance/getlist/group/bld.inf
sapi_messaging/tsrc/testing/performance/notify/group/bld.inf
sapi_messaging/tsrc/testing/performance/s60_asyncsend/group/bld.inf
sapi_messaging/tsrc/testing/performance/s60_delete/group/bld.inf
sapi_messaging/tsrc/testing/performance/s60_getlist/group/bld.inf
sapi_messaging/tsrc/testing/performance/s60_notify/group/bld.inf
sapi_messaging/tsrc/testing/performance/s60_send/group/bld.inf
sapi_messaging/tsrc/testing/performance/s60_status/group/bld.inf
sapi_messaging/tsrc/testing/performance/send/group/bld.inf
sapi_messaging/tsrc/testing/performance/status/group/bld.inf
sapi_messaging/tsrc/testing/tmessagingtest/async_send_message/group/async_send_message.pkg
sapi_messaging/tsrc/testing/tmessagingtest/async_send_message/group/bld.inf
sapi_messaging/tsrc/testing/tmessagingtest/change_status_message/group/bld.inf
sapi_messaging/tsrc/testing/tmessagingtest/change_status_message/group/change_status_message.pkg
sapi_messaging/tsrc/testing/tmessagingtest/delete_message/group/bld.inf
sapi_messaging/tsrc/testing/tmessagingtest/delete_message/group/delete_message.pkg
sapi_messaging/tsrc/testing/tmessagingtest/get_header_message/group/bld.inf
sapi_messaging/tsrc/testing/tmessagingtest/get_header_message/group/get_header_message.pkg
sapi_messaging/tsrc/testing/tmessagingtest/register_message/group/bld.inf
sapi_messaging/tsrc/testing/tmessagingtest/register_message/group/register_message.pkg
sapi_messaging/tsrc/testing/tmessagingtest/send_message/group/bld.inf
sapi_messaging/tsrc/testing/tmessagingtest/send_message/group/send_message.pkg
sapi_sensor/tsrc/dev/sensrprovidertest/group/bld.inf
sapi_sensor/tsrc/dev/sensrprovidertest/group/sensrprovidertest.pkg
sapi_sensor/tsrc/dev/sensrservicetest/group/bld.inf
sapi_sensor/tsrc/dev/sensrservicetest/group/sensrservicetest.pkg
sapi_sensor/tsrc/dev/tsnsrprovidertest/group/bld.inf
sapi_sensor/tsrc/dev/tsnsrprovidertest/group/tsnsrprovidertest.pkg
sapi_sensor/tsrc/testing/tsensorservice_test/group/bld.inf
sapi_sensor/tsrc/testing/tsensorservice_test/group/tsensorservice_test.pkg
sapi_sysinfo/src/sysinfointerface.cpp
sapi_sysinfo/src/sysinfoobserver.cpp
sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/group/bld.inf
sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/group/tsysinfoprovidergeneraltests.pkg
sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/group/bld.inf
sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/group/tsysinfoprovidernetworktests.pkg
sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/group/bld.inf
sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/group/tsysinfoprovidernegativetests.pkg
sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/group/bld.inf
sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/group/tsysinfoprovidertests.pkg
sapi_sysinfo/tsrc/dev/servicetests/manual/group/tsysinfomanualtests.pkg
sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfobattery/group/bld.inf
sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfobattery/group/tsysinfobattery.pkg
sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/group/bld.inf
sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/group/tsysinfogeneraltests.pkg
sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/group/bld.inf
sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/group/tsysinfonetworktests.pkg
sapi_sysinfo/tsrc/dev/servicetests/tsysinfoservicetests/group/bld.inf
sapi_sysinfo/tsrc/dev/servicetests/tsysinfoservicetests/group/tsysinfoservicetests.pkg
sapi_sysinfo/tsrc/testing/tsysbattery/group/bld.inf
sapi_sysinfo/tsrc/testing/tsysbattery/group/tsysbattery.pkg
sapi_sysinfo/tsrc/testing/tsysconnectivity/group/bld.inf
sapi_sysinfo/tsrc/testing/tsysconnectivity/group/tsysconnectivity.pkg
sapi_sysinfo/tsrc/testing/tsysdevice/group/bld.inf
sapi_sysinfo/tsrc/testing/tsysdevice/group/tsysdevice.pkg
sapi_sysinfo/tsrc/testing/tsysdisplay/group/bld.inf
sapi_sysinfo/tsrc/testing/tsysdisplay/group/tsysdisplay.pkg
sapi_sysinfo/tsrc/testing/tsysfeatures/group/bld.inf
sapi_sysinfo/tsrc/testing/tsysfeatures/group/tsysfeatures.pkg
sapi_sysinfo/tsrc/testing/tsysgeneral/group/bld.inf
sapi_sysinfo/tsrc/testing/tsysgeneral/group/tsysgeneral.pkg
sapi_sysinfo/tsrc/testing/tsysmanualtest/group/bld.inf
sapi_sysinfo/tsrc/testing/tsysmanualtest/group/tsysmanualtest.pkg
sapi_sysinfo/tsrc/testing/tsysmemory/group/bld.inf
sapi_sysinfo/tsrc/testing/tsysmemory/group/tsysmemory.pkg
sapi_sysinfo/tsrc/testing/tsysnetwork/group/bld.inf
sapi_sysinfo/tsrc/testing/tsysnetwork/group/tsysnetwork.pkg
--- a/install/serviceapi.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/install/serviceapi.pkg	Fri May 08 08:20:08 2009 +0300
@@ -18,10 +18,10 @@
 &EN
 
 ;Header
-#{"Platform Service Extensions"},(0x200100BE),1,0,0, TYPE=SA,RU
+#{"Platform Service Extensions"},(0x200100BE),1,0,1, TYPE=SA,RU
 
-;Supports S60 3.0
-[0x101F7961], 0, 0, 0, {"S60ProductID"}
+; S60 5.0 dependency
+[0x1028315F], 0, 0, 0, {"Series60ProductID"}
 
 ;Localised Vendor name
 %{"Nokia"}
--- a/sapi_applicationmanager/tsrc/dev/tappmanagerprovidertest/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_applicationmanager/tsrc/dev/tappmanagerprovidertest/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -1,5 +1,12 @@
 /*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies).
+* ==============================================================================
+*  Name        : Bld.inf
+*  Part of     : tgetlistapplication.mmp
+*
+*  Description : tgetlistapplication.mmp
+*  Version:   0.5
+*
+* 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 the License "Eclipse Public License v1.0"
@@ -11,20 +18,24 @@
 *
 * Contributors:
 *
-* Description:  tgetlistapplication.mmp
+* Description:  This is a top level bld file to generate all sapi libraries.
 *
+* ============================================================================
 */
 
 
-
 PRJ_PLATFORMS
 DEFAULT
 
+PRJ_TESTEXPORTS
+..\conf\tappmanagerprovidertest.cfg 		/epoc32/winscw/c/testframework/tappmanagerprovidertest.cfg
 
+PRJ_TESTMMPFILES
+tappmanagerprovidertest.mmp
 
 PRJ_EXPORTS
-../conf/tappmanagerprovidertest.cfg 		/epoc32/winscw/c/testframework/tappmanagerprovidertest.cfg
+
 
 PRJ_MMPFILES
-tappmanagerprovidertest.mmp
+
 //  End of File
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sapi_applicationmanager/tsrc/dev/tappmanagerprovidertest/group/tappmanagerprovidertest.pkg	Fri May 08 08:20:08 2009 +0300
@@ -0,0 +1,68 @@
+; ============================================================================
+; Copyright (c) 2007 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:   package file for Service API package
+; ============================================================================
+
+;Languages
+&EN
+
+;Header
+#{"App Mgr"},(0x102833AA),1,0,0
+
+;Supports S60 3.0
+[0x101F7961], 0, 0, 0, {"S60ProductID"}
+
+;Localised Vendor name
+%{"Nokia"}
+
+;Unique Vendor name
+:"Nokia"
+
+;SAPI Binaries to Install
+
+
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\appmanagerservice.dll"-"C:\sys\bin\appmanagerservice.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\appmanagerprovider.dll"-"C:\sys\bin\appmanagerprovider.dll"
+"..\..\..\..\..\..\..\epoc32\release\armv5\urel\tappmanagerprovidertest.dll"-"C:\sys\bin\tappmanagerprovidertest.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\liwServiceHandler.dll"     	-"!:\sys\bin\liwServiceHandler.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\liwResolver.dll"          	-"!:\sys\bin\liwResolver.dll"
+
+;ini file
+"..\init\Testframework.ini"-"c:\Testframework\Testframework.ini"
+
+;cfg file
+"..\conf\tappmanagerprovidertest.cfg"-"c:\Testframework\tappmanagerprovidertest.cfg"
+
+; SAPI resource files
+;"..\..\..\..\..\..\..\epoc32\data\Z\Resource\Plugins\appmanagerprovider.rsc"-"C:\resource\plugins\appmanagerprovider.rsc"
+
+;"..\..\..\..\..\..\..\epoc32\data\z\resource\liwServiceHandler.RSC"    			-"!:\resource\liwServiceHandler.RSC"
+;"..\..\..\..\..\..\..\epoc32\data\z\resource\plugins\liwResolver.RSC"				-"!:\resource\plugins\liwResolver.RSC"
+
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\RTSecMgrServer.exe"          -"!:\sys\bin\RTSecMgrServer.exe"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\RTSecMgrUtil.dll"          -"!:\sys\bin\RTSecMgrUtil.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\RTSecMgrClient.dll"          -"!:\sys\bin\RTSecMgrClient.dll"
+;"..\..\..\..\..\..\..\epoc32\data\Z\resource\apps\RTSecManager.rsc"     - "!:\resource\RTSecManager.rsc"
+
+"..\data\c\hello.txt"  - "C:\Data\Hello.txt"
+"..\data\c\images\AppTest1.jpg"  - "C:\Data\Images\AppTest1.jpg"
+"..\data\c\images\AppTest2.jpg"  - "C:\Data\Images\AppTest2.jpg"
+"..\data\c\images\AppTest3.jpg"  - "C:\Data\Images\AppTest3.jpg"
+"..\data\c\images\AppTest4.jpg"  - "C:\Data\Images\AppTest4.jpg"
+"..\data\c\images\AppTest5.jpg"  - "C:\Data\Images\AppTest5.jpg"
+"..\data\c\images\AppTest6.jpg"  - "C:\Data\Images\AppTest6.jpg"
+"..\data\c\images\AppTest7.jpg"  - "C:\Data\Images\AppTest7.jpg"
+"..\data\c\images\AppTest8.jpg"  - "C:\Data\Images\AppTest8.jpg"
+"..\data\c\images\test1.jpg"  - "C:\Data\Images\test1.jpg"
+"..\data\c\msg.sisx"  - "C:\Data\msg.sisx"
--- a/sapi_applicationmanager/tsrc/dev/tappmanagerprovidertest/group/tprovidertest.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-; ============================================================================
-; Copyright (c) 2007 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:   package file for Service API package
-; ============================================================================
-
-;Languages
-&EN
-
-;Header
-#{"App Mgr"},(0x102833AA),1,0,0
-
-;Supports S60 3.0
-[0x101F7961], 0, 0, 0, {"S60ProductID"}
-
-;Localised Vendor name
-%{"Nokia"}
-
-;Unique Vendor name
-:"Nokia"
-
-;SAPI Binaries to Install
-
-;Loggingservice binaries
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\appmanagerservice.dll"-"C:\sys\bin\appmanagerservice.dll"
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\appmanagerprovider.dll"-"C:\sys\bin\appmanagerprovider.dll"
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\tappmanagerprovidertest.dll"-"C:\sys\bin\tappmanagerprovidertest.dll"
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\liwServiceHandler.dll"     	-"!:\sys\bin\liwServiceHandler.dll"
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\liwResolver.dll"          	-"!:\sys\bin\liwResolver.dll"
-
-;ini file
-"..\init\Testframework.ini"-"c:\Testframework\Testframework1.ini"
-
-;cfg file
-"..\conf\tappmanagerprovidertest.cfg"-"c:\Testframework\tappmanagerprovidertest.cfg"
-
-; SAPI resource files
-"..\..\..\..\..\..\..\epoc32\data\Z\Resource\Plugins\appmanagerprovider.rsc"-"C:\resource\plugins\appmanagerprovider.rsc"
-
-"..\..\..\..\..\..\..\epoc32\data\z\resource\liwServiceHandler.RSC"    			-"!:\resource\liwServiceHandler.RSC"
-"..\..\..\..\..\..\..\epoc32\data\z\resource\plugins\liwResolver.RSC"				-"!:\resource\plugins\liwResolver.RSC"
-
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\RTSecMgrServer.exe"          -"!:\sys\bin\RTSecMgrServer.exe"
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\RTSecMgrUtil.dll"          -"!:\sys\bin\RTSecMgrUtil.dll"
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\RTSecMgrClient.dll"          -"!:\sys\bin\RTSecMgrClient.dll"
-"..\..\..\..\..\..\..\epoc32\data\Z\resource\apps\RTSecManager.rsc"     - "!:\resource\RTSecManager.rsc"
-
-"..\data\c\hello.txt"  - "C:\Data\Hello.txt"
-"..\data\c\images\AppTest1.jpg"  - "C:\Data\Images\AppTest1.jpg"
-"..\data\c\images\AppTest2.jpg"  - "C:\Data\Images\AppTest2.jpg"
-"..\data\c\images\AppTest3.jpg"  - "C:\Data\Images\AppTest3.jpg"
-"..\data\c\images\AppTest4.jpg"  - "C:\Data\Images\AppTest4.jpg"
-"..\data\c\images\AppTest5.jpg"  - "C:\Data\Images\AppTest5.jpg"
-"..\data\c\images\AppTest6.jpg"  - "C:\Data\Images\AppTest6.jpg"
-"..\data\c\images\AppTest7.jpg"  - "C:\Data\Images\AppTest7.jpg"
-"..\data\c\images\AppTest8.jpg"  - "C:\Data\Images\AppTest8.jpg"
-"..\data\c\images\test1.jpg"  - "C:\Data\Images\test1.jpg"
-"..\data\c\msg.sisx"  - "C:\Data\msg.sisx"
--- a/sapi_applicationmanager/tsrc/dev/tappmanagertest/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_applicationmanager/tsrc/dev/tappmanagertest/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -1,5 +1,12 @@
 /*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies).
+* ==============================================================================
+*  Name        : Bld.inf
+*  Part of     : tgetlistapplication.mmp
+*
+*  Description : tgetlistapplication.mmp
+*  Version:   0.5
+*
+* 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 the License "Eclipse Public License v1.0"
@@ -10,21 +17,21 @@
 * Nokia Corporation - initial contribution.
 *
 * Contributors:
-*
-* Description:  tgetlistapplication.mmp
-*
+* ============================================================================
 */
 
 
-
 PRJ_PLATFORMS
 DEFAULT
 
+PRJ_TESTEXPORTS
+..\conf\tappmanagertest.cfg 		/epoc32/winscw/c/testframework/tappmanagertest.cfg
 
+PRJ_TESTMMPFILES
+tappmanagertest.mmp
 
 PRJ_EXPORTS
-../conf/tappmanagertest.cfg 		/epoc32/winscw/c/testframework/tappmanagertest.cfg
 
 PRJ_MMPFILES
-tappmanagertest.mmp
+
 //  End of File
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sapi_applicationmanager/tsrc/dev/tappmanagertest/group/tappmanagertest.pkg	Fri May 08 08:20:08 2009 +0300
@@ -0,0 +1,55 @@
+; ============================================================================
+; Copyright (c) 2007 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:   package file for Service API package
+; ============================================================================
+
+;Languages
+&EN
+
+;Header
+#{"App Mgr"},(0x102833AA),1,0,0
+
+;Supports S60 3.0
+[0x101F7961], 0, 0, 0, {"S60ProductID"}
+
+;Localised Vendor name
+%{"Nokia"}
+
+;Unique Vendor name
+:"Nokia"
+
+;SAPI Binaries to Install
+
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\appmanagerservice.dll"-"C:\sys\bin\appmanagerservice.dll"
+"..\..\..\..\..\..\..\epoc32\release\armv5\urel\tappmanagertest.dll"-"C:\sys\bin\tappmanagertest.dll"
+
+
+;ini file
+"..\init\Testframework.ini"-"c:\Testframework\Testframework.ini"
+
+;cfg file
+"..\conf\tappmanagertest.cfg"-"c:\Testframework\tappmanagertest.cfg"
+
+
+
+;"..\data\c\Hello.txt"  - "C:\Data\Hello.txt"
+"..\data\c\images\AppTest1.jpg"  - "C:\Data\Images\AppTest1.jpg"
+"..\data\c\images\AppTest2.jpg"  - "C:\Data\Images\AppTest2.jpg"
+"..\data\c\images\AppTest3.jpg"  - "C:\Data\Images\AppTest3.jpg"
+"..\data\c\images\AppTest4.jpg"  - "C:\Data\Images\AppTest4.jpg"
+"..\data\c\images\AppTest5.jpg"  - "C:\Data\Images\AppTest5.jpg"
+"..\data\c\images\AppTest6.jpg"  - "C:\Data\Images\AppTest6.jpg"
+"..\data\c\images\AppTest7.jpg"  - "C:\Data\Images\AppTest7.jpg"
+"..\data\c\images\AppTest8.jpg"  - "C:\Data\Images\AppTest8.jpg"
+"..\data\c\images\test1.jpg"  - "C:\Data\Images\test1.jpg"
--- a/sapi_applicationmanager/tsrc/dev/tappmanagertest/group/tprovidertest.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ /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 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:   package file for Service API package
-; ============================================================================
-
-;Languages
-&EN
-
-;Header
-#{"App Mgr"},(0x102833AA),1,0,0
-
-;Supports S60 3.0
-[0x101F7961], 0, 0, 0, {"S60ProductID"}
-
-;Localised Vendor name
-%{"Nokia"}
-
-;Unique Vendor name
-:"Nokia"
-
-;SAPI Binaries to Install
-
-;Loggingservice binaries
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\appmanagerservice.dll"-"C:\sys\bin\appmanagerservice.dll"
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\tappmanagertest.dll"-"C:\sys\bin\tappmanagertest.dll"
-
-
-;ini file
-"..\init\Testframework.ini"-"c:\Testframework\Testframework1.ini"
-
-;cfg file
-"..\conf\tappmanagertest.cfg"-"c:\Testframework\tappmanagertest.cfg"
-
-
-
-;"..\data\c\Hello.txt"  - "C:\Data\Hello.txt"
-"..\data\c\images\AppTest1.jpg"  - "C:\Data\Images\AppTest1.jpg"
-"..\data\c\images\AppTest2.jpg"  - "C:\Data\Images\AppTest2.jpg"
-"..\data\c\images\AppTest3.jpg"  - "C:\Data\Images\AppTest3.jpg"
-"..\data\c\images\AppTest4.jpg"  - "C:\Data\Images\AppTest4.jpg"
-"..\data\c\images\AppTest5.jpg"  - "C:\Data\Images\AppTest5.jpg"
-"..\data\c\images\AppTest6.jpg"  - "C:\Data\Images\AppTest6.jpg"
-"..\data\c\images\AppTest7.jpg"  - "C:\Data\Images\AppTest7.jpg"
-"..\data\c\images\AppTest8.jpg"  - "C:\Data\Images\AppTest8.jpg"
-"..\data\c\images\test1.jpg"  - "C:\Data\Images\test1.jpg"
--- a/sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -1,5 +1,12 @@
 /*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies).
+* ==============================================================================
+*  Name        : Bld.inf
+*  Part of     : tgetlistapplication.mmp
+*
+*  Description : tgetlistapplication.mmp
+*  Version:   0.5
+*
+* 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 the License "Eclipse Public License v1.0"
@@ -11,20 +18,20 @@
 *
 * Contributors:
 *
-* Description:  tgetlistapplication.mmp
-*
+* ============================================================================
 */
 
 
-
 PRJ_PLATFORMS
 DEFAULT
 
+PRJ_TESTEXPORTS
+..\conf\tappmanprovidernegativetest.cfg 		/epoc32/winscw/c/testframework/tappmanprovidernegativetest.cfg
 
+PRJ_TESTMMPFILES
+tappmanprovidernegativetest.mmp
 
 PRJ_EXPORTS
-../conf/tappmanprovidernegativetest.cfg 		/epoc32/winscw/c/testframework/tappmanprovidernegativetest.cfg
 
 PRJ_MMPFILES
-tappmanprovidernegativetest.mmp
 //  End of File
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/group/tappmanprovidernegativetest.pkg	Fri May 08 08:20:08 2009 +0300
@@ -0,0 +1,57 @@
+; ============================================================================
+; Copyright (c) 2007 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:   package file for Service API package
+; ============================================================================
+
+;Languages
+&EN
+
+;Header
+#{"App Mgr"},(0x102833AA),1,0,0
+
+;Supports S60 3.0
+[0x101F7961], 0, 0, 0, {"S60ProductID"}
+
+;Localised Vendor name
+%{"Nokia"}
+
+;Unique Vendor name
+:"Nokia"
+
+;SAPI Binaries to Install
+
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\appmanagerservice.dll"-"C:\sys\bin\appmanagerservice.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\appmanagerprovider.dll"-"C:\sys\bin\appmanagerprovider.dll"
+"..\..\..\..\..\..\..\epoc32\release\armv5\urel\tappmanprovidernegativetest.dll"-"C:\sys\bin\tappmanprovidernegativetest.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\liwServiceHandler.dll"     	-"!:\sys\bin\liwServiceHandler.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\liwResolver.dll"          	-"!:\sys\bin\liwResolver.dll"
+
+;ini file
+;"..\..\..\..\..\..\..\epoc32\WINSCW\C\TestFramework\Testframework.ini"-"c:\Testframework\Testframework.ini"
+
+;cfg file
+"..\conf\tappmanprovidernegativetest.cfg"-"c:\Testframework\tappmanprovidernegativetest.cfg"
+
+; SAPI resource files
+;"..\..\..\..\..\..\..\epoc32\data\Z\Resource\Plugins\appmanagerprovider.rsc"-"C:\resource\plugins\appmanagerprovider.rsc"
+
+;"..\..\..\..\..\..\..\epoc32\data\z\resource\liwServiceHandler.RSC"    			-"!:\resource\liwServiceHandler.RSC"
+;"..\..\..\..\..\..\..\epoc32\data\z\resource\plugins\liwResolver.RSC"				-"!:\resource\plugins\liwResolver.RSC"
+
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\RTSecMgrServer.exe"          -"!:\sys\bin\RTSecMgrServer.exe"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\RTSecMgrUtil.dll"          -"!:\sys\bin\RTSecMgrUtil.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\RTSecMgrClient.dll"          -"!:\sys\bin\RTSecMgrClient.dll"
+;"..\..\..\..\..\..\..\epoc32\data\Z\resource\apps\RTSecManager.rsc"     - "!:\resource\RTSecManager.rsc"
+
+"..\data\c\Hello.txt"  - "C:\Data\Hello.txt"
--- a/sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/group/tprovidertest.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ /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 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:   package file for Service API package
-; ============================================================================
-
-;Languages
-&EN
-
-;Header
-#{"App Mgr"},(0x102833AA),1,0,0
-
-;Supports S60 3.0
-[0x101F7961], 0, 0, 0, {"S60ProductID"}
-
-;Localised Vendor name
-%{"Nokia"}
-
-;Unique Vendor name
-:"Nokia"
-
-;SAPI Binaries to Install
-
-;Loggingservice binaries
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\appmanagerservice.dll"-"C:\sys\bin\appmanagerservice.dll"
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\appmanagerprovider.dll"-"C:\sys\bin\appmanagerprovider.dll"
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\tappmanprovidernegativetest.dll"-"C:\sys\bin\tappmanprovidernegativetest.dll"
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\liwServiceHandler.dll"     	-"!:\sys\bin\liwServiceHandler.dll"
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\liwResolver.dll"          	-"!:\sys\bin\liwResolver.dll"
-
-;ini file
-"..\..\..\..\..\..\..\epoc32\WINSCW\C\TestFramework\Testframework.ini"-"c:\Testframework\Testframework1.ini"
-
-;cfg file
-"..\conf\tappmanprovidernegativetest.cfg"-"c:\Testframework\tappmanprovidernegativetest.cfg"
-
-; SAPI resource files
-"..\..\..\..\..\..\..\epoc32\data\Z\Resource\Plugins\appmanagerprovider.rsc"-"C:\resource\plugins\appmanagerprovider.rsc"
-
-"..\..\..\..\..\..\..\epoc32\data\z\resource\liwServiceHandler.RSC"    			-"!:\resource\liwServiceHandler.RSC"
-"..\..\..\..\..\..\..\epoc32\data\z\resource\plugins\liwResolver.RSC"				-"!:\resource\plugins\liwResolver.RSC"
-
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\RTSecMgrServer.exe"          -"!:\sys\bin\RTSecMgrServer.exe"
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\RTSecMgrUtil.dll"          -"!:\sys\bin\RTSecMgrUtil.dll"
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\RTSecMgrClient.dll"          -"!:\sys\bin\RTSecMgrClient.dll"
-"..\..\..\..\..\..\..\epoc32\data\Z\resource\apps\RTSecManager.rsc"     - "!:\resource\RTSecManager.rsc"
-
-"..\data\c\Hello.txt"  - "C:\Data\Hello.txt"
--- a/sapi_applicationmanager/tsrc/dev/testappmngui/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_applicationmanager/tsrc/dev/testappmngui/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -1,5 +1,12 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* ==============================================================================
+*  Name        : Bld.inf
+*  Part of     : tgetlistapplication.mmp
+*
+*  Description : tgetlistapplication.mmp
+*  Version:   0.5
+*
+* 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 the License "Eclipse Public License v1.0"
@@ -11,11 +18,12 @@
 *
 * Contributors:
 *
-* Description: 
-*
+* ============================================================================
 */
 
+PRJ_TESTMMPFILES
+testappmngui.mmp
+
 PRJ_MMPFILES
 
-testappmngui.mmp
 
--- a/sapi_applicationmanager/tsrc/dev/testappmngui/group/testappmngui.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_applicationmanager/tsrc/dev/testappmngui/group/testappmngui.pkg	Fri May 08 08:20:08 2009 +0300
@@ -42,12 +42,12 @@
 "\epoc32\data\z\resource\apps\testappmngui.Rsc" -"!:\resource\apps\testappmngui.Rsc"
 "\epoc32\data\z\resource\apps\testappmngui_loc.Rsc" -"!:\resource\apps\testappmngui_loc.Rsc"
 "\epoc32\release\ARMV5\UREL\testappmngui.exe" -"!:\sys\bin\testappmngui.exe"
-"\epoc32\release\ARMV5\UREL\appmanagerservice.dll " -"!:\sys\bin\appmanagerservice.dll "
+;"\epoc32\release\ARMV5\UREL\appmanagerservice.dll " -"!:\sys\bin\appmanagerservice.dll "
 "..\data\C\Images\Test1.jpg" - "!:\Data\Images\Test1.jpg"
 "..\data\C\msg.sisx" - "!:\msg.sisx"
 
 ; Main EXE
-"\epoc32\release\ARMV5\urel\tappmanagertest.dll"  -   "!:\sys\bin\tappmanagertest.dll"
+;"\epoc32\release\ARMV5\urel\tappmanagertest.dll"  -   "!:\sys\bin\tappmanagertest.dll"
 
 ;"..\conf\tappmanagertest.cfg" - "!:\Testframework\tappmanagertest.cfg"
 ;"..\init\TestFramework.ini"   - "!:\Testframework\TestFrame.ini"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sapi_applicationmanager/tsrc/testing/tappmgrprovider/group/tappmgrprovider.pkg	Fri May 08 08:20:08 2009 +0300
@@ -0,0 +1,63 @@
+; ============================================================================
+; Copyright (c) 2007 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:   package file for Service API package
+; ============================================================================
+
+;Languages
+&EN
+
+;Header
+#{"App Mgr"},(0x102833AA),1,0,0
+
+;Supports S60 3.0
+[0x101F7961], 0, 0, 0, {"S60ProductID"}
+
+;Localised Vendor name
+%{"Nokia"}
+
+;Unique Vendor name
+:"Nokia"
+
+;SAPI Binaries to Install
+
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\appmanagerservice.dll"-"C:\sys\bin\appmanagerservice.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\appmanagerprovider.dll"-"C:\sys\bin\appmanagerprovider.dll"
+"..\..\..\..\..\..\..\epoc32\release\armv5\urel\tappmgrprovider.dll"-"C:\sys\bin\tappmgrprovider.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\liwServiceHandler.dll"     	-"!:\sys\bin\liwServiceHandler.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\liwResolver.dll"          	-"!:\sys\bin\liwResolver.dll"
+
+;ini file
+"..\init\Testframework.ini"-"c:\Testframework\Testframework.ini"
+
+;cfg file
+"..\conf\tappmgrprovider.cfg"-"c:\Testframework\tappmgrprovider.cfg"
+
+; SAPI resource files
+;"..\..\..\..\..\..\..\epoc32\data\Z\Resource\Plugins\appmanagerprovider.rsc"-"C:\resource\plugins\appmanagerprovider.rsc"
+
+;"..\..\..\..\..\..\..\epoc32\data\z\resource\liwServiceHandler.RSC"    			-"!:\resource\liwServiceHandler.RSC"
+;"..\..\..\..\..\..\..\epoc32\data\z\resource\plugins\liwResolver.RSC"				-"!:\resource\plugins\liwResolver.RSC"
+
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\RTSecMgrServer.exe"          -"!:\sys\bin\RTSecMgrServer.exe"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\RTSecMgrUtil.dll"          -"!:\sys\bin\RTSecMgrUtil.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\RTSecMgrClient.dll"          -"!:\sys\bin\RTSecMgrClient.dll"
+;"..\..\..\..\..\..\..\epoc32\data\Z\resource\apps\RTSecManager.rsc"     - "!:\resource\RTSecManager.rsc"
+
+"..\data\c\Hello.txt"  - "C:\Data\Hello.txt"
+
+"..\data\c\images\pict.jpg"  - "C:\Data\images\pict.jpg"
+"..\data\c\images\sapi.jpg"  - "C:\Data\images\sapi.jpg"
+"..\data\c\test.txt"  - "C:\Data\test.txt"
+"..\data\c\msg.sisx"  - "C:\Data\msg.sisx"
+
--- a/sapi_applicationmanager/tsrc/testing/tappmgrprovider/group/tprovidertest.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-; ============================================================================
-; Copyright (c) 2007 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:   package file for Service API package
-; ============================================================================
-
-;Languages
-&EN
-
-;Header
-#{"App Mgr"},(0x102833AA),1,0,0
-
-;Supports S60 3.0
-[0x101F7961], 0, 0, 0, {"S60ProductID"}
-
-;Localised Vendor name
-%{"Nokia"}
-
-;Unique Vendor name
-:"Nokia"
-
-;SAPI Binaries to Install
-
-;Loggingservice binaries
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\appmanagerservice.dll"-"C:\sys\bin\appmanagerservice.dll"
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\appmanagerprovider.dll"-"C:\sys\bin\appmanagerprovider.dll"
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\tappmgrprovider.dll"-"C:\sys\bin\tappmgrprovider.dll"
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\liwServiceHandler.dll"     	-"!:\sys\bin\liwServiceHandler.dll"
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\liwResolver.dll"          	-"!:\sys\bin\liwResolver.dll"
-
-;ini file
-"..\init\Testframework.ini"-"c:\Testframework\Testframework1.ini"
-
-;cfg file
-"..\conf\tappmgrprovider.cfg"-"c:\Testframework\tappmgrprovider.cfg"
-
-; SAPI resource files
-"..\..\..\..\..\..\..\epoc32\data\Z\Resource\Plugins\appmanagerprovider.rsc"-"C:\resource\plugins\appmanagerprovider.rsc"
-
-"..\..\..\..\..\..\..\epoc32\data\z\resource\liwServiceHandler.RSC"    			-"!:\resource\liwServiceHandler.RSC"
-"..\..\..\..\..\..\..\epoc32\data\z\resource\plugins\liwResolver.RSC"				-"!:\resource\plugins\liwResolver.RSC"
-
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\RTSecMgrServer.exe"          -"!:\sys\bin\RTSecMgrServer.exe"
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\RTSecMgrUtil.dll"          -"!:\sys\bin\RTSecMgrUtil.dll"
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\RTSecMgrClient.dll"          -"!:\sys\bin\RTSecMgrClient.dll"
-"..\..\..\..\..\..\..\epoc32\data\Z\resource\apps\RTSecManager.rsc"     - "!:\resource\RTSecManager.rsc"
-
-"..\data\c\Hello.txt"  - "C:\Data\Hello.txt"
-
-"..\data\c\images\pict.jpg"  - "C:\Data\images\pict.jpg"
-"..\data\c\images\sapi.jpg"  - "C:\Data\images\sapi.jpg"
-"..\data\c\test.txt"  - "C:\Data\test.txt"
-"..\data\c\msg.sisx"  - "C:\Data\msg.sisx"
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sapi_applicationmanager/tsrc/testing/tappmgrtest/group/tappmgrtest.pkg	Fri May 08 08:20:08 2009 +0300
@@ -0,0 +1,52 @@
+; ============================================================================
+; Copyright (c) 2007 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:   package file for Service API package
+; ============================================================================
+
+;Languages
+&EN
+
+;Header
+#{"App Mgr"},(0x102833AA),1,0,0
+
+;Supports S60 3.0
+[0x101F7961], 0, 0, 0, {"S60ProductID"}
+
+;Localised Vendor name
+%{"Nokia"}
+
+;Unique Vendor name
+:"Nokia"
+
+;SAPI Binaries to Install
+
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\appmanagerservice.dll"-"C:\sys\bin\appmanagerservice.dll"
+"..\..\..\..\..\..\..\epoc32\release\armv5\urel\tappmgrtest.dll"-"C:\sys\bin\tappmgrtest.dll"
+
+
+;ini file
+"..\init\Testframework.ini"-"c:\Testframework\Testframework.ini"
+
+;cfg file
+"..\conf\tappmgrtest.cfg"-"c:\Testframework\tappmgrtest.cfg"
+
+
+
+"..\data\c\images\pict.jpg"  - "C:\Data\images\pict.jpg"
+"..\data\c\images\sapi.jpg"  - "C:\Data\images\sapi.jpg"
+"..\data\c\test.txt"  - "C:\Data\test.txt"
+"..\data\c\msg.sisx"  - "C:\Data\msg.sisx"
+"..\data\c\SpruceBlocks.jar"  - "C:\Data\SpruceBlocks.jar"
+
+
--- a/sapi_applicationmanager/tsrc/testing/tappmgrtest/group/tprovidertest.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ /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 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:   package file for Service API package
-; ============================================================================
-
-;Languages
-&EN
-
-;Header
-#{"App Mgr"},(0x102833AA),1,0,0
-
-;Supports S60 3.0
-[0x101F7961], 0, 0, 0, {"S60ProductID"}
-
-;Localised Vendor name
-%{"Nokia"}
-
-;Unique Vendor name
-:"Nokia"
-
-;SAPI Binaries to Install
-
-;Loggingservice binaries
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\appmanagerservice.dll"-"C:\sys\bin\appmanagerservice.dll"
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\tappmgrtest.dll"-"C:\sys\bin\tappmgrtest.dll"
-
-
-;ini file
-"..\init\Testframework.ini"-"c:\Testframework\Testframework1.ini"
-
-;cfg file
-"..\conf\tappmgrtest.cfg"-"c:\Testframework\tappmgrtest.cfg"
-
-
-
-"..\data\c\images\pict.jpg"  - "C:\Data\images\pict.jpg"
-"..\data\c\images\sapi.jpg"  - "C:\Data\images\sapi.jpg"
-"..\data\c\test.txt"  - "C:\Data\test.txt"
-"..\data\c\msg.sisx"  - "C:\Data\msg.sisx"
-"..\data\c\SpruceBlocks.jar"  - "C:\Data\SpruceBlocks.jar"
-
-
--- a/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -26,6 +26,7 @@
 PRJ_TESTEXPORTS
 // NOTE: If using ARS requirements all export operations should be done under this.
 // 'abld test export'
+../conf/tcalendaradditer3.cfg	/epoc32/WINSCW/C/TestFramework/tcalendaradditer3.cfg
 
 PRJ_EXPORTS
 // Specify the source file followed by its destination here
@@ -36,11 +37,12 @@
 /*
 /agnmodel/inc/AGMCOMON.H
 */
-../conf/tcalendaradditer3.cfg	/epoc32/WINSCW/C/TestFramework/tcalendaradditer3.cfg
+
 
 PRJ_TESTMMPFILES
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
+tcalendaradditer3.mmp
 
 PRJ_MMPFILES
 // Specify the .mmp files required for building the important component
@@ -56,6 +58,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-tcalendaradditer3.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/group/tcalendaradditer3.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/group/tcalendaradditer3.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Calendarservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tcalendaradditer3.dll"-"C:\sys\bin\tcalendaradditer3.dll"
 
 
--- a/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarchangenotifyiter3/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarchangenotifyiter3/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -26,6 +26,7 @@
 PRJ_TESTEXPORTS
 // NOTE: If using ARS requirements all export operations should be done under this.
 // 'abld test export'
+../conf/tcalendarchangenotifyiter3.cfg	/epoc32/WINSCW/C/TestFramework/tcalendarchangenotifyiter3.cfg
 
 PRJ_EXPORTS
 // Specify the source file followed by its destination here
@@ -36,11 +37,12 @@
 /*
 /agnmodel/inc/AGMCOMON.H
 */
-../conf/tcalendarchangenotifyiter3.cfg	/epoc32/WINSCW/C/TestFramework/tcalendarchangenotifyiter3.cfg
+
 
 PRJ_TESTMMPFILES
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
+tcalendarchangenotifyiter3.mmp
 
 PRJ_MMPFILES
 // Specify the .mmp files required for building the important component
@@ -56,6 +58,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-tcalendarchangenotifyiter3.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarchangenotifyiter3/group/tcalendarchangenotifyiter3.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarchangenotifyiter3/group/tcalendarchangenotifyiter3.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;calendarservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tcalendarchangenotifyiter3.dll"-"C:\sys\bin\tcalendarchangenotifyiter3.dll"
 
 
--- a/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -26,6 +26,7 @@
 PRJ_TESTEXPORTS
 // NOTE: If using ARS requirements all export operations should be done under this.
 // 'abld test export'
+../conf/tcalendardeleteiter3.cfg	/epoc32/WINSCW/C/TestFramework/tcalendardeleteiter3.cfg
 
 PRJ_EXPORTS
 // Specify the source file followed by its destination here
@@ -36,11 +37,12 @@
 /*
 /agnmodel/inc/AGMCOMON.H
 */
-../conf/tcalendardeleteiter3.cfg	/epoc32/WINSCW/C/TestFramework/tcalendardeleteiter3.cfg
+
 
 PRJ_TESTMMPFILES
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
+tcalendardeleteiter3.mmp
 
 PRJ_MMPFILES
 // Specify the .mmp files required for building the important component
@@ -56,6 +58,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-tcalendardeleteiter3.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/group/tcalendardeleteiter3.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/group/tcalendardeleteiter3.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Calendarservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tcalendardeleteiter3.dll"-"C:\sys\bin\tcalendardeleteiter3.dll"
 
 
--- a/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarexportiter3/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarexportiter3/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -26,6 +26,7 @@
 PRJ_TESTEXPORTS
 // NOTE: If using ARS requirements all export operations should be done under this.
 // 'abld test export'
+../conf/tcalendarexportiter3.cfg	/epoc32/WINSCW/C/TestFramework/tcalendarexportiter3.cfg
 
 PRJ_EXPORTS
 // Specify the source file followed by its destination here
@@ -36,11 +37,12 @@
 /*
 /agnmodel/inc/AGMCOMON.H
 */
-../conf/tcalendarexportiter3.cfg	/epoc32/WINSCW/C/TestFramework/tcalendarexportiter3.cfg
+
 
 PRJ_TESTMMPFILES
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
+tcalendarexportiter3.mmp
 
 PRJ_MMPFILES
 // Specify the .mmp files required for building the important component
@@ -56,6 +58,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-tcalendarexportiter3.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarexportiter3/group/tcalendarexportiter3.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarexportiter3/group/tcalendarexportiter3.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Calendarservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tcalendarexportiter3.dll"-"C:\sys\bin\tcalendarexportiter3.dll"
 
 
--- a/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -15,17 +15,22 @@
 *
 */
 
-
-
-
 PRJ_PLATFORMS
 DEFAULT
 
+PRJ_TESTEXPORTS
+// NOTE: If using ARS requirements all export operations should be done under this.
+// 'abld test export'
+../conf/tcalendargenerictest.cfg 		/epoc32/winscw/c/testframework/tcalendargenerictest.cfg
 
+PRJ_TESTMMPFILES
+// NOTE: If using ARS requirements .mmp file operation should be done under this.
+// 'abld test build'
+tcalendargenerictest.mmp
 
 PRJ_EXPORTS
-../conf/tcalendargenerictest.cfg 		/epoc32/winscw/c/testframework/tcalendargenerictest.cfg
+
 
 PRJ_MMPFILES
-tcalendargenerictest.mmp
+
 //  End of File
\ No newline at end of file
--- a/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/group/tcalendargenerictest.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/group/tcalendargenerictest.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Calendarservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tcalendargenerictest.dll"-"C:\sys\bin\tcalendargenerictest.dll"
 
 
--- a/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargetlistiter3/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargetlistiter3/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -26,6 +26,7 @@
 PRJ_TESTEXPORTS
 // NOTE: If using ARS requirements all export operations should be done under this.
 // 'abld test export'
+../conf/tcalendargetlistiter3.cfg	/epoc32/WINSCW/C/TestFramework/tcalendargetlistiter3.cfg
 
 PRJ_EXPORTS
 // Specify the source file followed by its destination here
@@ -36,11 +37,12 @@
 /*
 /agnmodel/inc/AGMCOMON.H
 */
-../conf/tcalendargetlistiter3.cfg	/epoc32/WINSCW/C/TestFramework/tcalendargetlistiter3.cfg
+
 
 PRJ_TESTMMPFILES
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
+tcalendargetlistiter3.mmp
 
 PRJ_MMPFILES
 // Specify the .mmp files required for building the important component
@@ -56,6 +58,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-tcalendargetlistiter3.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargetlistiter3/group/tcalendargetlistiter3.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargetlistiter3/group/tcalendargetlistiter3.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Calendarservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tcalendargetlistiter3.dll"-"C:\sys\bin\tcalendargetlistiter3.dll"
 
 
--- a/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarimportiter3/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarimportiter3/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -26,6 +26,7 @@
 PRJ_TESTEXPORTS
 // NOTE: If using ARS requirements all export operations should be done under this.
 // 'abld test export'
+../conf/tcalendarimportiter3.cfg	/epoc32/WINSCW/C/TestFramework/tcalendarimportiter3.cfg
 
 PRJ_EXPORTS
 // Specify the source file followed by its destination here
@@ -36,11 +37,12 @@
 /*
 /agnmodel/inc/AGMCOMON.H
 */
-../conf/tcalendarimportiter3.cfg	/epoc32/WINSCW/C/TestFramework/tcalendarimportiter3.cfg
+
 
 PRJ_TESTMMPFILES
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
+tcalendarimportiter3.mmp
 
 PRJ_MMPFILES
 // Specify the .mmp files required for building the important component
@@ -56,6 +58,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-tcalendarimportiter3.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarimportiter3/group/tcalendarimportiter3.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarimportiter3/group/tcalendarimportiter3.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Calendarservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tcalendarimportiter3.dll"-"C:\sys\bin\tcalendarimportiter3.dll"
 
 
--- a/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarupdateiter3/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarupdateiter3/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -26,6 +26,7 @@
 PRJ_TESTEXPORTS
 // NOTE: If using ARS requirements all export operations should be done under this.
 // 'abld test export'
+../conf/tcalendarupdateiter3.cfg	/epoc32/WINSCW/C/TestFramework/tcalendarupdateiter3.cfg
 
 PRJ_EXPORTS
 // Specify the source file followed by its destination here
@@ -36,11 +37,12 @@
 /*
 /agnmodel/inc/AGMCOMON.H
 */
-../conf/tcalendarupdateiter3.cfg	/epoc32/WINSCW/C/TestFramework/tcalendarupdateiter3.cfg
+
 
 PRJ_TESTMMPFILES
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
+tcalendarupdateiter3.mmp
 
 PRJ_MMPFILES
 // Specify the .mmp files required for building the important component
@@ -56,6 +58,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-tcalendarupdateiter3.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarupdateiter3/group/tcalendarupdateiter3.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarupdateiter3/group/tcalendarupdateiter3.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Calendarservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tcalendarupdateiter3.dll"-"C:\sys\bin\tcalendarupdateiter3.dll"
 
 
--- a/sapi_calendar/tsrc/dev/tcalendartest/tcalendaradditer1/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/dev/tcalendartest/tcalendaradditer1/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -26,6 +26,7 @@
 PRJ_TESTEXPORTS
 // NOTE: If using ARS requirements all export operations should be done under this.
 // 'abld test export'
+../conf/tcalendaradditer1.cfg	/epoc32/WINSCW/C/TestFramework/tcalendaradditer1.cfg
 
 PRJ_EXPORTS
 // Specify the source file followed by its destination here
@@ -36,11 +37,12 @@
 /*
 /agnmodel/inc/AGMCOMON.H
 */
-../conf/tcalendaradditer1.cfg	/epoc32/WINSCW/C/TestFramework/tcalendaradditer1.cfg
+
 
 PRJ_TESTMMPFILES
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
+tcalendaradditer1.mmp
 
 PRJ_MMPFILES
 // Specify the .mmp files required for building the important component
@@ -56,6 +58,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-tcalendaradditer1.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_calendar/tsrc/dev/tcalendartest/tcalendaradditer1/group/tcalendaradditer1.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/dev/tcalendartest/tcalendaradditer1/group/tcalendaradditer1.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Calendarservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tcalendaradditer1.dll"-"C:\sys\bin\tcalendaradditer1.dll"
 
 
--- a/sapi_calendar/tsrc/dev/tcalendartest/tcalendarchangenotifyiter1/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/dev/tcalendartest/tcalendarchangenotifyiter1/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -26,6 +26,7 @@
 PRJ_TESTEXPORTS
 // NOTE: If using ARS requirements all export operations should be done under this.
 // 'abld test export'
+../conf/tcalendarchangenotifyiter1.cfg	/epoc32/WINSCW/C/TestFramework/tcalendarchangenotifyiter1.cfg
 
 PRJ_EXPORTS
 // Specify the source file followed by its destination here
@@ -36,11 +37,12 @@
 /*
 /agnmodel/inc/AGMCOMON.H
 */
-../conf/tcalendarchangenotifyiter1.cfg	/epoc32/WINSCW/C/TestFramework/tcalendarchangenotifyiter1.cfg
+
 
 PRJ_TESTMMPFILES
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
+tcalendarchangenotifyiter1.mmp
 
 PRJ_MMPFILES
 // Specify the .mmp files required for building the important component
@@ -56,6 +58,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-tcalendarchangenotifyiter1.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_calendar/tsrc/dev/tcalendartest/tcalendarchangenotifyiter1/group/tcalendarchangenotifyiter1.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/dev/tcalendartest/tcalendarchangenotifyiter1/group/tcalendarchangenotifyiter1.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Calendarservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tcalendarchangenotifyiter1.dll"-"C:\sys\bin\tcalendarchangenotifyiter1.dll"
 
 
--- a/sapi_calendar/tsrc/dev/tcalendartest/tcalendardeleteiter1/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/dev/tcalendartest/tcalendardeleteiter1/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -26,6 +26,7 @@
 PRJ_TESTEXPORTS
 // NOTE: If using ARS requirements all export operations should be done under this.
 // 'abld test export'
+../conf/tcalendardeleteiter1.cfg	/epoc32/WINSCW/C/TestFramework/tcalendardeleteiter1.cfg
 
 PRJ_EXPORTS
 // Specify the source file followed by its destination here
@@ -36,11 +37,12 @@
 /*
 /agnmodel/inc/AGMCOMON.H
 */
-../conf/tcalendardeleteiter1.cfg	/epoc32/WINSCW/C/TestFramework/tcalendardeleteiter1.cfg
+
 
 PRJ_TESTMMPFILES
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
+tcalendardeleteiter1.mmp
 
 PRJ_MMPFILES
 // Specify the .mmp files required for building the important component
@@ -56,6 +58,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-tcalendardeleteiter1.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_calendar/tsrc/dev/tcalendartest/tcalendardeleteiter1/group/tcalendardeleteiter1.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/dev/tcalendartest/tcalendardeleteiter1/group/tcalendardeleteiter1.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Calendarservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tcalendardeleteiter1.dll"-"C:\sys\bin\tcalendardeleteiter1.dll"
 
 
--- a/sapi_calendar/tsrc/dev/tcalendartest/tcalendarexportiter1/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/dev/tcalendartest/tcalendarexportiter1/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -26,6 +26,7 @@
 PRJ_TESTEXPORTS
 // NOTE: If using ARS requirements all export operations should be done under this.
 // 'abld test export'
+../conf/tcalendarexportiter1.cfg	/epoc32/WINSCW/C/TestFramework/tcalendarexportiter1.cfg
 
 PRJ_EXPORTS
 // Specify the source file followed by its destination here
@@ -36,11 +37,12 @@
 /*
 /agnmodel/inc/AGMCOMON.H
 */
-../conf/tcalendarexportiter1.cfg	/epoc32/WINSCW/C/TestFramework/tcalendarexportiter1.cfg
+
 
 PRJ_TESTMMPFILES
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
+tcalendarexportiter1.mmp
 
 PRJ_MMPFILES
 // Specify the .mmp files required for building the important component
@@ -56,6 +58,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-tcalendarexportiter1.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_calendar/tsrc/dev/tcalendartest/tcalendarexportiter1/group/tcalendarexportiter1.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/dev/tcalendartest/tcalendarexportiter1/group/tcalendarexportiter1.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Calendarservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tcalendarexportiter1.dll"-"C:\sys\bin\tcalendarexportiter1.dll"
 
 
--- a/sapi_calendar/tsrc/dev/tcalendartest/tcalendargetlistiter1/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/dev/tcalendartest/tcalendargetlistiter1/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -26,6 +26,7 @@
 PRJ_TESTEXPORTS
 // NOTE: If using ARS requirements all export operations should be done under this.
 // 'abld test export'
+../conf/tcalendargetlistiter1.cfg	/epoc32/WINSCW/C/TestFramework/tcalendargetlistiter1.cfg
 
 PRJ_EXPORTS
 // Specify the source file followed by its destination here
@@ -36,11 +37,12 @@
 /*
 /agnmodel/inc/AGMCOMON.H
 */
-../conf/tcalendargetlistiter1.cfg	/epoc32/WINSCW/C/TestFramework/tcalendargetlistiter1.cfg
+
 
 PRJ_TESTMMPFILES
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
+tcalendargetlistiter1.mmp
 
 PRJ_MMPFILES
 // Specify the .mmp files required for building the important component
@@ -56,6 +58,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-tcalendargetlistiter1.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_calendar/tsrc/dev/tcalendartest/tcalendargetlistiter1/group/tcalendargetlistiter1.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/dev/tcalendartest/tcalendargetlistiter1/group/tcalendargetlistiter1.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Calendarservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tcalendargetlistiter1.dll"-"C:\sys\bin\tcalendargetlistiter1.dll"
 
 
--- a/sapi_calendar/tsrc/dev/tcalendartest/tcalendarimportiter1/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/dev/tcalendartest/tcalendarimportiter1/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -26,6 +26,7 @@
 PRJ_TESTEXPORTS
 // NOTE: If using ARS requirements all export operations should be done under this.
 // 'abld test export'
+../conf/tcalendarimportiter1.cfg	/epoc32/WINSCW/C/TestFramework/tcalendarimportiter1.cfg
 
 PRJ_EXPORTS
 // Specify the source file followed by its destination here
@@ -36,11 +37,12 @@
 /*
 /agnmodel/inc/AGMCOMON.H
 */
-../conf/tcalendarimportiter1.cfg	/epoc32/WINSCW/C/TestFramework/tcalendarimportiter1.cfg
+
 
 PRJ_TESTMMPFILES
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
+tcalendarimportiter1.mmp
 
 PRJ_MMPFILES
 // Specify the .mmp files required for building the important component
@@ -56,6 +58,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-tcalendarimportiter1.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_calendar/tsrc/dev/tcalendartest/tcalendarimportiter1/group/tcalendarimportiter1.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/dev/tcalendartest/tcalendarimportiter1/group/tcalendarimportiter1.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Calendarservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tcalendarimportiter1.dll"-"C:\sys\bin\tcalendarimportiter1.dll"
 
 
--- a/sapi_calendar/tsrc/dev/tcalendartest/tcalendarupdateiter1/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/dev/tcalendartest/tcalendarupdateiter1/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -26,6 +26,7 @@
 PRJ_TESTEXPORTS
 // NOTE: If using ARS requirements all export operations should be done under this.
 // 'abld test export'
+../conf/tcalendarupdateiter1.cfg	/epoc32/WINSCW/C/TestFramework/tcalendarupdateiter1.cfg
 
 PRJ_EXPORTS
 // Specify the source file followed by its destination here
@@ -36,11 +37,12 @@
 /*
 /agnmodel/inc/AGMCOMON.H
 */
-../conf/tcalendarupdateiter1.cfg	/epoc32/WINSCW/C/TestFramework/tcalendarupdateiter1.cfg
+
 
 PRJ_TESTMMPFILES
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
+tcalendarupdateiter1.mmp
 
 PRJ_MMPFILES
 // Specify the .mmp files required for building the important component
@@ -56,6 +58,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-tcalendarupdateiter1.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_calendar/tsrc/dev/tcalendartest/tcalendarupdateiter1/group/tcalendarupdateiter1.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/dev/tcalendartest/tcalendarupdateiter1/group/tcalendarupdateiter1.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Calendarservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tcalendarupdateiter1.dll"-"C:\sys\bin\tcalendarupdateiter1.dll"
 
 
--- a/sapi_calendar/tsrc/testing/tcal_providertest/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/testing/tcal_providertest/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -23,10 +23,20 @@
 // 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'
+../conf/tcal_providertest.cfg 		/epoc32/winscw/c/testframework/tcal_providertest.cfg
+
 PRJ_EXPORTS
-../conf/tcal_providertest.cfg 		/epoc32/winscw/c/testframework/tcal_providertest.cfg
+
+
+PRJ_TESTMMPFILES
+// NOTE: If using ARS requirements .mmp file operation should be done under this.
+// 'abld test build'
+tcal_providertest.mmp
 
 PRJ_MMPFILES
-tcal_providertest.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_calendar/tsrc/testing/tcal_providertest/group/tcal_providertest.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/testing/tcal_providertest/group/tcal_providertest.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Calendarservice binaries
-"..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
+;"..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
 "..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tcal_providertest.dll"-"C:\sys\bin\tcal_providertest.dll"
 
 
--- a/sapi_calendar/tsrc/testing/tcalendarservice/tcal_add/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/testing/tcalendarservice/tcal_add/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -40,6 +40,7 @@
 PRJ_TESTMMPFILES
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
+tcal_add.mmp
 
 PRJ_MMPFILES
 // Specify the .mmp files required for building the important component
@@ -55,6 +56,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-tcal_add.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_calendar/tsrc/testing/tcalendarservice/tcal_add/group/tcal_add.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/testing/tcalendarservice/tcal_add/group/tcal_add.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Calendarservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tcal_add.dll"-"C:\sys\bin\tcal_add.dll"
 
 
--- a/sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -40,6 +40,7 @@
 PRJ_TESTMMPFILES
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
+tcal_changenotify.mmp
 
 PRJ_MMPFILES
 // Specify the .mmp files required for building the important component
@@ -55,6 +56,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-tcal_changenotify.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/group/tcal_changenotify.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/group/tcal_changenotify.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Calendarservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tcal_changenotify.dll"-"C:\sys\bin\tcal_changenotify.dll"
 
 
--- a/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -40,6 +40,7 @@
 PRJ_TESTMMPFILES
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
+tcal_delete.mmp
 
 PRJ_MMPFILES
 // Specify the .mmp files required for building the important component
@@ -55,6 +56,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-tcal_delete.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/group/tcal_delete.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/group/tcal_delete.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Calendarservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tcal_delete.dll"-"C:\sys\bin\tcal_delete.dll"
 
 
--- a/sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -40,6 +40,7 @@
 PRJ_TESTMMPFILES
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
+tcal_export.mmp
 
 PRJ_MMPFILES
 // Specify the .mmp files required for building the important component
@@ -55,6 +56,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-tcal_export.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/group/tcal_export.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/group/tcal_export.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Calendarservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tcal_export.dll"-"C:\sys\bin\tcal_export.dll"
 
 
--- a/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -26,7 +26,7 @@
 PRJ_TESTEXPORTS
 // NOTE: If using ARS requirements all export operations should be done under this.
 // 'abld test export'
-
+../conf/tcal_getlist.cfg	/epoc32/WINSCW/C/TestFramework/tcal_getlist.cfg
 
 PRJ_EXPORTS
 // Specify the source file followed by its destination here
@@ -37,11 +37,12 @@
 /*
 /agnmodel/inc/AGMCOMON.H
 */
-../conf/tcal_getlist.cfg	/epoc32/WINSCW/C/TestFramework/tcal_getlist.cfg
+
 
 PRJ_TESTMMPFILES
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
+tcal_getlist.mmp
 
 PRJ_MMPFILES
 // Specify the .mmp files required for building the important component
@@ -57,6 +58,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-tcal_getlist.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/group/tcal_getlist.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/group/tcal_getlist.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Calendarservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tcal_getlist.dll"-"C:\sys\bin\tcal_getlist.dll"
 
 
--- a/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -40,6 +40,7 @@
 PRJ_TESTMMPFILES
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
+tcal_import.mmp
 
 PRJ_MMPFILES
 // Specify the .mmp files required for building the important component
@@ -55,6 +56,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-tcal_import.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/group/tcal_import.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/group/tcal_import.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Calendarservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tcal_import.dll"-"C:\sys\bin\tcal_import.dll"
 
 
--- a/sapi_calendar/tsrc/testing/tcalendarservice/tcal_update/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/testing/tcalendarservice/tcal_update/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -40,6 +40,7 @@
 PRJ_TESTMMPFILES
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
+tcal_update.mmp
 
 PRJ_MMPFILES
 // Specify the .mmp files required for building the important component
@@ -55,6 +56,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-tcal_update.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_calendar/tsrc/testing/tcalendarservice/tcal_update/group/tcal_update.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/testing/tcalendarservice/tcal_update/group/tcal_update.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Calendarservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tcal_update.dll"-"C:\sys\bin\tcal_update.dll"
 
 
--- a/sapi_calendar/tsrc/testing/tcalprovider_combined/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/testing/tcalprovider_combined/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -40,6 +40,7 @@
 PRJ_TESTMMPFILES
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
+tcalprovider_combined.mmp
 
 PRJ_MMPFILES
 // Specify the .mmp files required for building the important component
@@ -55,6 +56,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-tcalprovider_combined.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_calendar/tsrc/testing/tcalprovider_combined/group/tcalprovider_combined.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_calendar/tsrc/testing/tcalprovider_combined/group/tcalprovider_combined.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Calendarservice binaries
-"..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
+;"..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\Calendarservice.dll"
 "..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tcalprovider_combined.dll"-"C:\sys\bin\tcalprovider_combined.dll"
 
 
--- a/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -25,13 +25,20 @@
 
 
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 
 ../conf/tcontactprovidertest.cfg	/epoc32/WINSCW/C/TestFramework/tcontactprovidertest.cfg
 ../data/c/contacts.cdb	/epoc32/WINSCW/C/private/10003a73/contacts.cdb
 ../data/c/vcardimportposbased.vcf	/epoc32/WINSCW/C/vcardimportposbased.vcf
 ../data/c/vcardimport.vcf	/epoc32/WINSCW/C/vcardimport.vcf
-PRJ_MMPFILES
+PRJ_EXPORTS
+//All files under this section are been moved to PRJ_TESTEXPORTS
+
+PRJ_TESTMMPFILES
 tcontactprovidertest.mmp
 
+
+
+PRJ_MMPFILES
+
 //  End of File
\ No newline at end of file
--- a/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest/group/tcontactprovidertest.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest/group/tcontactprovidertest.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Contactservice binaries
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\contactservice.dll"-"C:\sys\bin\contactservice.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\contactservice.dll"-"C:\sys\bin\contactservice.dll"
 "..\..\..\..\..\..\..\epoc32\release\armv5\urel\tcontactprovidertest.dll"-"C:\sys\bin\tcontactprovidertest.dll"
 
 
--- a/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest_sync/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest_sync/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -23,13 +23,17 @@
 // defaults to WINS MARM so you can ignore this if you just build these
 DEFAULT
 
+PRJ_TESTEXPORTS
 
+../conf/tcontactprovidertest_sync.cfg	/epoc32/WINSCW/C/TestFramework/tcontactprovidertest_sync.cfg
+../data/c/import.vcf	/epoc32/WINSCW/C/data/import.vcf
 
 PRJ_EXPORTS
 
-../conf/tcontactprovidertest_sync.cfg	/epoc32/WINSCW/C/TestFramework/tcontactprovidertest_sync.cfg
-../data/c/import.vcf	/epoc32/WINSCW/C/data/import.vcf
-PRJ_MMPFILES
+//All files under this section are been moved to PRJ_TESTEXPORTS
+
+PRJ_TESTMMPFILES
 tcontactprovidertest_sync.mmp
 
+PRJ_MMPFILES
 //  End of File
\ No newline at end of file
--- a/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest_sync/group/tcontactprovidertest_sync.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest_sync/group/tcontactprovidertest_sync.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Contactservice binaries
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\contactservice.dll"-"C:\sys\bin\contactservice.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\contactservice.dll"-"C:\sys\bin\contactservice.dll"
 "..\..\..\..\..\..\..\epoc32\release\armv5\urel\tcontactprovidertest_sync.dll"-"C:\sys\bin\tcontactprovidertest_sync.dll"
 
 
--- a/sapi_contacts_vpbk/tsrc/dev/tcontacts_async/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_contacts_vpbk/tsrc/dev/tcontacts_async/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -20,10 +20,14 @@
 PRJ_PLATFORMS
 WINSCW ARMV5
 
+PRJ_TESTEXPORTS
+../conf/tcontacts_async.cfg /epoc32/WINSCW/C/TestFramework/tcontacts_async.cfg
+
 PRJ_EXPORTS
-../conf/tcontacts_async.cfg /epoc32/WINSCW/C/TestFramework/tcontacts_async.cfg
+//All files under this section are been moved to PRJ_TESTEXPORTS
+
+PRJ_TESTMMPFILES
+tcontacts_async.mmp
 
 PRJ_MMPFILES
-tcontacts_async.mmp
-
 //  End of File
\ No newline at end of file
--- a/sapi_contacts_vpbk/tsrc/dev/tcontacts_async/group/tcontacts_async.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_contacts_vpbk/tsrc/dev/tcontacts_async/group/tcontacts_async.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Contactservice binaries
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\contactservice.dll"-"C:\sys\bin\contactservice.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\contactservice.dll"-"C:\sys\bin\contactservice.dll"
 "..\..\..\..\..\..\..\epoc32\release\armv5\urel\tcontacts_async.dll"-"C:\sys\bin\tcontacts_async.dll"
 
 
--- a/sapi_contacts_vpbk/tsrc/dev/tcontacts_sim/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_contacts_vpbk/tsrc/dev/tcontacts_sim/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -22,9 +22,15 @@
 
 
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 ../conf/tcontacts_sim.cfg  /epoc32/WINSCW/C/TestFramework/tcontacts_sim.cfg
 //../data/c/import.vcf	/epoc32/WINSCW/C/data/Import.vcf
-PRJ_MMPFILES
+
+PRJ_EXPORTS
+//All files under this section are been moved to PRJ_TESTEXPORTS
+
+PRJ_TESTMMPFILES
 tcontacts_sim.mmp
+
+PRJ_MMPFILES
 //  End of File
\ No newline at end of file
--- a/sapi_contacts_vpbk/tsrc/dev/tcontacts_sim/group/tcontacts_sim.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_contacts_vpbk/tsrc/dev/tcontacts_sim/group/tcontacts_sim.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Contactservice binaries
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\contactservice.dll"-"C:\sys\bin\contactservice.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\contactservice.dll"-"C:\sys\bin\contactservice.dll"
 "..\..\..\..\..\..\..\epoc32\release\armv5\urel\tcontacts_sim.dll"-"C:\sys\bin\tcontacts_sim.dll"
 
 
--- a/sapi_contacts_vpbk/tsrc/dev/tcontacts_sync/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_contacts_vpbk/tsrc/dev/tcontacts_sync/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -20,10 +20,15 @@
 PRJ_PLATFORMS
 WINSCW ARMV5
 
+PRJ_TESTEXPORTS
+../conf/tcontacts_sync.cfg /epoc32/WINSCW/C/TestFramework/tcontacts_sync.cfg
 PRJ_EXPORTS
-../conf/tcontacts_sync.cfg /epoc32/WINSCW/C/TestFramework/tcontacts_sync.cfg
+//All files under this section are been moved to PRJ_TESTEXPORTS
 
+
+
+PRJ_TESTMMPFILES
+tcontacts_sync.mmp
 PRJ_MMPFILES
-tcontacts_sync.mmp
 
 //  End of File
\ No newline at end of file
--- a/sapi_contacts_vpbk/tsrc/dev/tcontacts_sync/group/tcontacts_sync.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_contacts_vpbk/tsrc/dev/tcontacts_sync/group/tcontacts_sync.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Contactservice binaries
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\contactservice.dll"-"C:\sys\bin\contactservice.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\contactservice.dll"-"C:\sys\bin\contactservice.dll"
 "..\..\..\..\..\..\..\epoc32\release\armv5\urel\tcontacts_sync.dll"-"C:\sys\bin\tcontacts_sync.dll"
 
 
--- a/sapi_contacts_vpbk/tsrc/dev/tcontactsprovidetest_sim/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_contacts_vpbk/tsrc/dev/tcontactsprovidetest_sim/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -22,10 +22,15 @@
 
 
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 ../conf/tcontactsprovider_sim.cfg  /epoc32/WINSCW/C/TestFramework/tcontactsprovider_sim.cfg
 //../data/import.vcf	/epoc32/WINSCW/C/data/Import.vcf
 ../data/c/Import1.vcf	/epoc32/WINSCW/C/data/Import1.vcf
-PRJ_MMPFILES
+
+PRJ_EXPORTS
+//All files under this section are been moved to PRJ_TESTEXPORTS
+PRJ_TESTMMPFILES
 tcontactsprovider_sim.mmp
+
+PRJ_MMPFILES
 //  End of File
\ No newline at end of file
--- a/sapi_contacts_vpbk/tsrc/dev/tcontactsprovidetest_sim/group/tcontactsprovider_sim.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_contacts_vpbk/tsrc/dev/tcontactsprovidetest_sim/group/tcontactsprovider_sim.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Contactservice binaries
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\contactservice.dll" - "C:\sys\bin\contactservice.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\contactservice.dll" - "C:\sys\bin\contactservice.dll"
 "..\..\..\..\..\..\..\epoc32\release\armv5\urel\tcontactsprovider_sim.dll" - "C:\sys\bin\tcontactsprovider_sim.dll"
 
 
--- a/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -23,9 +23,13 @@
 
 
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 ../conf/tprovidertest_vpbk.cfg 		/epoc32/winscw/c/testframework/tprovidertest_vpbk.cfg
 
-PRJ_MMPFILES
+PRJ_EXPORTS
+//All files under this section are been moved to PRJ_TESTEXPORTS
+PRJ_TESTMMPFILES
 tprovidertest_vpbk.mmp
+
+PRJ_MMPFILES
 //  End of File
\ No newline at end of file
--- a/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/group/tprovidertest_vpbk.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/group/tprovidertest_vpbk.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Contactservice binaries
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\contactservice.dll"-"C:\sys\bin\contactservice.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\contactservice.dll"-"C:\sys\bin\contactservice.dll"
 "..\..\..\..\..\..\..\epoc32\release\armv5\urel\tprovidertest_vpbk.dll"-"C:\sys\bin\tprovidertest_vpbk.dll"
 
 
--- a/sapi_contacts_vpbk/tsrc/testing/tcontact_add/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_contacts_vpbk/tsrc/testing/tcontact_add/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -38,10 +38,13 @@
 */
 
 PRJ_TESTMMPFILES
+tContact_add.mmp
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
 
+
 PRJ_MMPFILES
+
 // Specify the .mmp files required for building the important component
 // releasables.
 //
@@ -55,6 +58,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-tContact_add.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_contacts_vpbk/tsrc/testing/tcontact_add/group/tcontact_add.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_contacts_vpbk/tsrc/testing/tcontact_add/group/tcontact_add.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,8 +32,8 @@
 ;SAPI Binaries to Install
 
 ;Contactservice binaries
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\contactservice.dll"-"C:\sys\bin\contactservice.dll"
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\tcontactprovidertest.dll"-"C:\sys\bin\tcontactprovidertest.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\contactservice.dll"-"C:\sys\bin\contactservice.dll"
+"..\..\..\..\..\..\..\epoc32\release\armv5\urel\tContact_add.dll"-"C:\sys\bin\tContact_add.dll"
 
 
 ;ini file
--- a/sapi_contacts_vpbk/tsrc/testing/tcontact_delete/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_contacts_vpbk/tsrc/testing/tcontact_delete/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -38,6 +38,7 @@
 */
 
 PRJ_TESTMMPFILES
+tContact_delete.mmp
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
 
@@ -55,6 +56,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-tContact_delete.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_contacts_vpbk/tsrc/testing/tcontact_delete/group/tcontact_delete.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_contacts_vpbk/tsrc/testing/tcontact_delete/group/tcontact_delete.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,8 +32,8 @@
 ;SAPI Binaries to Install
 
 ;Contactservice binaries
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\contactservice.dll"-"C:\sys\bin\contactservice.dll"
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\tcontactprovidertest.dll"-"C:\sys\bin\tcontactprovidertest.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\contactservice.dll"-"C:\sys\bin\contactservice.dll"
+"..\..\..\..\..\..\..\epoc32\release\armv5\urel\tContact_delete.dll"-"C:\sys\bin\tContact_delete.dll"
 
 
 ;ini file
--- a/sapi_contacts_vpbk/tsrc/testing/tcontact_edit/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_contacts_vpbk/tsrc/testing/tcontact_edit/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -38,6 +38,7 @@
 */
 
 PRJ_TESTMMPFILES
+tContact_edit.mmp
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
 
@@ -55,6 +56,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-tContact_edit.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_contacts_vpbk/tsrc/testing/tcontact_edit/group/tcontact_edit.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_contacts_vpbk/tsrc/testing/tcontact_edit/group/tcontact_edit.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,8 +32,8 @@
 ;SAPI Binaries to Install
 
 ;Contactservice binaries
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\contactservice.dll"-"C:\sys\bin\contactservice.dll"
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\tcontactprovidertest.dll"-"C:\sys\bin\tcontactprovidertest.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\contactservice.dll"-"C:\sys\bin\contactservice.dll"
+"..\..\..\..\..\..\..\epoc32\release\armv5\urel\tContact_edit.dll"-"C:\sys\bin\tContact_edit.dll"
 
 
 ;ini file
--- a/sapi_contacts_vpbk/tsrc/testing/tcontact_export/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_contacts_vpbk/tsrc/testing/tcontact_export/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -38,6 +38,7 @@
 */
 
 PRJ_TESTMMPFILES
+tContact_export.mmp
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
 
@@ -55,6 +56,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-tContact_export.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_contacts_vpbk/tsrc/testing/tcontact_export/group/tcontact_export.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_contacts_vpbk/tsrc/testing/tcontact_export/group/tcontact_export.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,8 +32,8 @@
 ;SAPI Binaries to Install
 
 ;Contactservice binaries
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\contactservice.dll"-"C:\sys\bin\contactservice.dll"
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\tcontactprovidertest.dll"-"C:\sys\bin\tcontactprovidertest.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\contactservice.dll"-"C:\sys\bin\contactservice.dll"
+"..\..\..\..\..\..\..\epoc32\release\armv5\urel\tContact_export.dll"-"C:\sys\bin\tContact_export.dll"
 
 
 ;ini file
--- a/sapi_contacts_vpbk/tsrc/testing/tcontact_getlist/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_contacts_vpbk/tsrc/testing/tcontact_getlist/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -38,6 +38,7 @@
 */
 
 PRJ_TESTMMPFILES
+tContact_getlist.mmp
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
 
@@ -55,6 +56,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-tContact_getlist.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_contacts_vpbk/tsrc/testing/tcontact_getlist/group/tcontact_getlist.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_contacts_vpbk/tsrc/testing/tcontact_getlist/group/tcontact_getlist.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,8 +32,8 @@
 ;SAPI Binaries to Install
 
 ;Contactservice binaries
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\contactservice.dll"-"C:\sys\bin\contactservice.dll"
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\tcontactprovidertest.dll"-"C:\sys\bin\tcontactprovidertest.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\contactservice.dll"-"C:\sys\bin\contactservice.dll"
+"..\..\..\..\..\..\..\epoc32\release\armv5\urel\tContact_getlist.dll"-"C:\sys\bin\tContact_getlist.dll"
 
 
 ;ini file
--- a/sapi_contacts_vpbk/tsrc/testing/tcontact_import/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_contacts_vpbk/tsrc/testing/tcontact_import/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -38,6 +38,7 @@
 */
 
 PRJ_TESTMMPFILES
+tContact_import.mmp
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
 
@@ -55,6 +56,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-tContact_import.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_contacts_vpbk/tsrc/testing/tcontact_import/group/tcontact_import.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_contacts_vpbk/tsrc/testing/tcontact_import/group/tcontact_import.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,8 +32,8 @@
 ;SAPI Binaries to Install
 
 ;Contactservice binaries
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\contactservice.dll"-"C:\sys\bin\contactservice.dll"
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\tcontactprovidertest.dll"-"C:\sys\bin\tcontactprovidertest.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\contactservice.dll"-"C:\sys\bin\contactservice.dll"
+"..\..\..\..\..\..\..\epoc32\release\armv5\urel\tContact_import.dll"-"C:\sys\bin\tContact_import.dll"
 
 
 ;ini file
--- a/sapi_contacts_vpbk/tsrc/testing/tcontact_organise/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_contacts_vpbk/tsrc/testing/tcontact_organise/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -38,6 +38,7 @@
 */
 
 PRJ_TESTMMPFILES
+tContact_organise.mmp
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
 
@@ -55,6 +56,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-tContact_organise.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_contacts_vpbk/tsrc/testing/tcontact_organise/group/tcontact_organise.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_contacts_vpbk/tsrc/testing/tcontact_organise/group/tcontact_organise.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,8 +32,8 @@
 ;SAPI Binaries to Install
 
 ;Contactservice binaries
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\contactservice.dll"-"C:\sys\bin\contactservice.dll"
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\tcontactprovidertest.dll"-"C:\sys\bin\tcontactprovidertest.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\contactservice.dll"-"C:\sys\bin\contactservice.dll"
+"..\..\..\..\..\..\..\epoc32\release\armv5\urel\tContact_organise.dll"-"C:\sys\bin\tContact_organise.dll"
 
 
 ;ini file
--- a/sapi_landmarks/tsrc/dev/landmarks_inputparams/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_landmarks/tsrc/dev/landmarks_inputparams/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -24,11 +24,12 @@
 DEFAULT
 
 PRJ_TESTEXPORTS
+../conf/landmarks_inputparams.cfg /epoc32/winscw/c/TestFramework/landmarks_inputparams.cfg
 // NOTE: If using ARS requirements all export operations should be done under this.
 // 'abld test export'
 
 PRJ_EXPORTS
-../conf/landmarks_inputparams.cfg /epoc32/winscw/c/TestFramework/landmarks_inputparams.cfg
+
 // 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
@@ -39,6 +40,7 @@
 */
 
 PRJ_TESTMMPFILES
+landmarks_inputparams.mmp
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
 
@@ -56,6 +58,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-landmarks_inputparams.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_landmarks/tsrc/dev/landmarks_inputparams/group/landmarks_inputparams.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_landmarks/tsrc/dev/landmarks_inputparams/group/landmarks_inputparams.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Landmarksservice binaries
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\landmarkservice.dll"-"C:\sys\bin\landmarkservice.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\landmarkservice.dll"-"C:\sys\bin\landmarkservice.dll"
 "..\..\..\..\..\..\..\epoc32\release\armv5\urel\landmarks_inputparams.dll"-"C:\sys\bin\landmarks_inputparams.dll"
 
 
--- a/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlandmarkprovider/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlandmarkprovider/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -19,9 +19,9 @@
 PRJ_PLATFORMS
 WINSCW ARMV5
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 ../conf/tlandmarkprovider.cfg	/epoc32/WINSCW/C/TestFramework/tlandmarkprovider.cfg
-PRJ_MMPFILES
+PRJ_TESTMMPFILES
 
 TLandmarkProvider.mmp
 
--- a/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlandmarkprovider/group/tlandmarkprovider.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlandmarkprovider/group/tlandmarkprovider.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Landmarksservice binaries
-"..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\landmarkservice.dll"-"C:\sys\bin\landmarkservice.dll"
+;"..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\landmarkservice.dll"-"C:\sys\bin\landmarkservice.dll"
 "..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tlandmarkprovider.dll"-"C:\sys\bin\tlandmarkprovider.dll"
 
 
--- a/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlmprovidercategorytests/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlmprovidercategorytests/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -24,6 +24,7 @@
 DEFAULT
 
 PRJ_TESTEXPORTS
+../conf/tlmprovidercategorytests.cfg	/epoc32/WINSCW/C/TestFramework/tlmprovidercategorytests.cfg
 // NOTE: If using ARS requirements all export operations should be done under this.
 // 'abld test export'
 
@@ -36,14 +37,15 @@
 /*
 /agnmodel/inc/AGMCOMON.H
 */
-../conf/tlmprovidercategorytests.cfg	/epoc32/WINSCW/C/TestFramework/tlmprovidercategorytests.cfg
+
 
 PRJ_TESTMMPFILES
+tlmprovidercategorytests.mmp
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
 
 PRJ_MMPFILES
 
-tlmprovidercategorytests.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlmprovidercategorytests/group/tlmprovidercategorytests.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlmprovidercategorytests/group/tlmprovidercategorytests.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Landmarksservice binaries
-"..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\landmarkservice.dll"-"C:\sys\bin\landmarkservice.dll"
+;"..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\landmarkservice.dll"-"C:\sys\bin\landmarkservice.dll"
 "..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tlmprovidercategorytests.dll"-"C:\sys\bin\tlmprovidercategorytests.dll"
 
 
--- a/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlmproviderdbtests/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlmproviderdbtests/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -24,6 +24,7 @@
 DEFAULT
 
 PRJ_TESTEXPORTS
+../conf/tlmproviderdbtests.cfg	/epoc32/WINSCW/C/TestFramework/tlmproviderdbtests.cfg
 // NOTE: If using ARS requirements all export operations should be done under this.
 // 'abld test export'
 
@@ -36,14 +37,15 @@
 /*
 /agnmodel/inc/AGMCOMON.H
 */
-../conf/tlmproviderdbtests.cfg	/epoc32/WINSCW/C/TestFramework/tlmproviderdbtests.cfg
+
 
 PRJ_TESTMMPFILES
+tlmproviderdbtests.mmp
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
 
 PRJ_MMPFILES
 
-tlmproviderdbtests.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlmproviderdbtests/group/tlmproviderdbtests.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlmproviderdbtests/group/tlmproviderdbtests.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Landmarksservice binaries
-"..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\landmarkservice.dll"-"C:\sys\bin\landmarkservice.dll"
+;"..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\landmarkservice.dll"-"C:\sys\bin\landmarkservice.dll"
 "..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tlmproviderdbtests.dll"-"C:\sys\bin\tlmproviderdbtests.dll"
 
 
--- a/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmcategorytests/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmcategorytests/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -20,10 +20,10 @@
 PRJ_PLATFORMS
 WINSCW ARMV5
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 ../conf/tlmcategorytests.cfg	/epoc32/WINSCW/C/TestFramework/tlmcategorytests.cfg
 
-PRJ_MMPFILES
+PRJ_TESTMMPFILES
 tlmcategorytests.mmp
 
 //  End of File
\ No newline at end of file
--- a/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmcategorytests/group/tlmcategorytests.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmcategorytests/group/tlmcategorytests.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Landmarksservice binaries
-"..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\landmarkservice.dll"-"C:\sys\bin\landmarkservice.dll"
+;"..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\landmarkservice.dll"-"C:\sys\bin\landmarkservice.dll"
 "..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tlmcategorytests.dll"-"C:\sys\bin\tlmcategorytests.dll"
 
 
--- a/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmdatabasetests/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmdatabasetests/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -21,10 +21,10 @@
 PRJ_PLATFORMS
 WINSCW ARMV5
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 ../conf/Tlmdatabasetests.cfg	/epoc32/WINSCW/C/TestFramework/Tlmdatabasetests.cfg
 
-PRJ_MMPFILES
+PRJ_TESTMMPFILES
 Tlmdatabasetests.mmp
 
 //  End of File
\ No newline at end of file
--- a/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmdatabasetests/group/tlmdatabasetests.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmdatabasetests/group/tlmdatabasetests.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Landmarksservice binaries
-"..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\landmarkservice.dll"-"C:\sys\bin\landmarkservice.dll"
+;"..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\landmarkservice.dll"-"C:\sys\bin\landmarkservice.dll"
 "..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tlmdatabasetests.dll"-"C:\sys\bin\tlmdatabasetests.dll"
 
 
--- a/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -19,10 +19,10 @@
 PRJ_PLATFORMS
 WINSCW ARMV5
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 ../conf/tlmlandmarktests.cfg	/epoc32/WINSCW/C/TestFramework/tlmlandmarktests.cfg
 
-PRJ_MMPFILES
+PRJ_TESTMMPFILES
 tlmlandmarktests.mmp
 
 //  End of File
\ No newline at end of file
--- a/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/group/tlmlandmarktests.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/group/tlmlandmarktests.pkg	Fri May 08 08:20:08 2009 +0300
@@ -1,5 +1,5 @@
-;
-; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+; ============================================================================
+; Copyright (c) 2007 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"
@@ -11,8 +11,12 @@
 ;
 ; Contributors:
 ;
-; Description:  
-;
+; Description:   package file for Service API package
+; ============================================================================
+
+;files.pkg
+; Languages
+; none -  English only by default
 &EN
 ; Installation header
 ; Only one component name as we only support English
@@ -40,7 +44,7 @@
 :"Nokia Corporation"
 
 ;Landmarksservice binaries
-"..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\landmarkservice.dll"-"C:\sys\bin\landmarkservice.dll"
+;"..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\landmarkservice.dll"-"C:\sys\bin\landmarkservice.dll"
 "..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tlmlandmarktests.dll"-"C:\sys\bin\tlmlandmarktests.dll"
 
 ;INI FILE
--- a/sapi_landmarks/tsrc/testing/tlandmark_provider/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_landmarks/tsrc/testing/tlandmark_provider/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -23,10 +23,10 @@
 // defaults to WINS MARM so you can ignore this if you just build these
 DEFAULT
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 ../conf/tlandmark_provider.cfg 		/epoc32/winscw/c/testframework/tlandmark_provider.cfg
 
-PRJ_MMPFILES
+PRJ_TESTMMPFILES
 tlandmark_provider.mmp
 
 //  End of File
\ No newline at end of file
--- a/sapi_landmarks/tsrc/testing/tlandmark_provider/group/tlandmark_provider.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_landmarks/tsrc/testing/tlandmark_provider/group/tlandmark_provider.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Landmarksservice binaries
-"..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\landmarkservice.dll"-"C:\sys\bin\landmarkservice.dll"
+;"..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\landmarkservice.dll"-"C:\sys\bin\landmarkservice.dll"
 "..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tlandmark_provider.dll"-"C:\sys\bin\tlandmark_provider.dll"
 
 
--- a/sapi_landmarks/tsrc/testing/tproviderlmarktest/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_landmarks/tsrc/testing/tproviderlmarktest/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -23,10 +23,10 @@
 // defaults to WINS MARM so you can ignore this if you just build these
 DEFAULT
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 ../conf/tproviderlmarktest.cfg 		/epoc32/winscw/c/testframework/tproviderlmarktest.cfg
 
-PRJ_MMPFILES
+PRJ_TESTMMPFILES
 tproviderlmarktest.mmp
 
 //  End of File
\ No newline at end of file
--- a/sapi_landmarks/tsrc/testing/tproviderlmarktest/group/tproviderlmarktest.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_landmarks/tsrc/testing/tproviderlmarktest/group/tproviderlmarktest.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Landmarksservice binaries
-"..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\landmarkservice.dll"-"C:\sys\bin\landmarkservice.dll"
+;"..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\landmarkservice.dll"-"C:\sys\bin\landmarkservice.dll"
 "..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tproviderlmarktest.dll"-"C:\sys\bin\tproviderlmarktest.dll"
 
 
--- a/sapi_location/tsrc/dev/tlocationprovidertest/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_location/tsrc/dev/tlocationprovidertest/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -26,36 +26,17 @@
 PRJ_TESTEXPORTS
 // NOTE: If using ARS requirements all export operations should be done under this.
 // 'abld test export'
+../conf/tlocationprovidertest.cfg	/epoc32/WINSCW/C/TestFramework/tlocationprovidertest.cfg
 
-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
-*/
-../conf/tlocationprovidertest.cfg	/epoc32/WINSCW/C/TestFramework/tlocationprovidertest.cfg
+
+
 
 PRJ_TESTMMPFILES
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
-
-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
-*/
 tlocationprovidertest.mmp
 
+
+
+
 //  End of File
\ No newline at end of file
--- a/sapi_location/tsrc/dev/tlocationprovidertest/group/tlocationprovidertest.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_location/tsrc/dev/tlocationprovidertest/group/tlocationprovidertest.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;locationservice binaries
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\locationservice.dll"-"C:\sys\bin\locationservice.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\locationservice.dll"-"C:\sys\bin\locationservice.dll"
 "..\..\..\..\..\..\..\epoc32\release\armv5\urel\tlocationprovidertest.dll"-"C:\sys\bin\tlocationprovidertest.dll"
 
 
--- a/sapi_location/tsrc/dev/tlocmanualtest/group/tlocmanualtest.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_location/tsrc/dev/tlocmanualtest/group/tlocmanualtest.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;locationservice binaries
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\locationservice.dll"-"C:\sys\bin\locationservice.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\locationservice.dll"-"C:\sys\bin\locationservice.dll"
 "..\..\..\..\..\..\..\epoc32\release\armv5\urel\tlocmanualtest.dll"-"C:\sys\bin\tlocmanualtest.dll"
 
 
--- a/sapi_location/tsrc/dev/tlocservicetest/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_location/tsrc/dev/tlocservicetest/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -26,36 +26,16 @@
 PRJ_TESTEXPORTS
 // NOTE: If using ARS requirements all export operations should be done under this.
 // 'abld test export'
+../conf/tlocservicetest.cfg	/epoc32/WINSCW/C/TestFramework/tlocservicetest.cfg
 
-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
-*/
-../conf/tlocservicetest.cfg	/epoc32/WINSCW/C/TestFramework/tlocservicetest.cfg
+
 
 PRJ_TESTMMPFILES
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
-
-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
-*/
 tlocservicetest.mmp
 
+
+
+
 //  End of File
\ No newline at end of file
--- a/sapi_location/tsrc/dev/tlocservicetest/group/tlocservicetest.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_location/tsrc/dev/tlocservicetest/group/tlocservicetest.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;locationservice binaries
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\locationservice.dll"-"C:\sys\bin\locationservice.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\locationservice.dll"-"C:\sys\bin\locationservice.dll"
 "..\..\..\..\..\..\..\epoc32\release\armv5\urel\tlocservicetest.dll"-"C:\sys\bin\tlocservicetest.dll"
 
 
--- a/sapi_location/tsrc/testing/performance/pgetbearing/group/getbearing.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_location/tsrc/testing/performance/pgetbearing/group/getbearing.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;locationservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\locationservice.dll"-"C:\sys\bin\locationservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\locationservice.dll"-"C:\sys\bin\locationservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\getbearperf.exe"-"C:\sys\bin\getbearperf.exe"
 
 
--- a/sapi_location/tsrc/testing/performance/pgetdistance/group/getdistperf.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_location/tsrc/testing/performance/pgetdistance/group/getdistperf.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;locationservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\locationservice.dll"-"C:\sys\bin\locationservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\locationservice.dll"-"C:\sys\bin\locationservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\getdistperf.exe"-"C:\sys\bin\getdistperf.exe"
 
 
--- a/sapi_location/tsrc/testing/tlocmanualtest/group/tlocmanualtest.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_location/tsrc/testing/tlocmanualtest/group/tlocmanualtest.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Locationservice binaries
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\locationservice.dll"-"C:\sys\bin\locationservice.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\locationservice.dll"-"C:\sys\bin\locationservice.dll"
 "..\..\..\..\..\..\..\epoc32\release\armv5\urel\tlocmanualtest.dll"-"C:\sys\bin\tlocmanualtest.dll"
 
 
--- a/sapi_location/tsrc/testing/tloctest/group/tloctest.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_location/tsrc/testing/tloctest/group/tloctest.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Locationservice binaries
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\locationservice.dll" - "C:\sys\bin\locationservice.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\locationservice.dll" - "C:\sys\bin\locationservice.dll"
 "..\..\..\..\..\..\..\epoc32\release\armv5\urel\tloctest.dll" - "C:\sys\bin\tloctest.dll"
 
 
--- a/sapi_location/tsrc/testing/tprovidertest/group/tprovidertest.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_location/tsrc/testing/tprovidertest/group/tprovidertest.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Loggingservice binaries
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\locationservice.dll"-"C:\sys\bin\locationservice.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\locationservice.dll"-"C:\sys\bin\locationservice.dll"
 "..\..\..\..\..\..\..\epoc32\release\armv5\urel\tprovidertest.dll"-"C:\sys\bin\tprovidertest.dll"
 
 
--- a/sapi_location/tsrc/testing/tsapiloctest/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_location/tsrc/testing/tsapiloctest/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -22,14 +22,16 @@
 DEFAULT
 
 PRJ_TESTEXPORTS
+../conf/tsapiloctest.cfg	/epoc32/WINSCW/C/TestFramework/tsapiloctest.cfg
 
 
-PRJ_EXPORTS
-../conf/tsapiloctest.cfg	/epoc32/WINSCW/C/TestFramework/tsapiloctest.cfg
+
+
 
 PRJ_TESTMMPFILES
-
-PRJ_MMPFILES
 tsapiloctest.mmp
 
+
+
+
 //  End of File
\ No newline at end of file
--- a/sapi_location/tsrc/testing/tsapiloctest/group/tsapiloctest.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_location/tsrc/testing/tsapiloctest/group/tsapiloctest.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Loggingservice binaries
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\locationservice.dll"-"C:\sys\bin\locationservice.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\locationservice.dll"-"C:\sys\bin\locationservice.dll"
 "..\..\..\..\..\..\..\epoc32\release\armv5\urel\tsapiloctest.dll"-"C:\sys\bin\tsapiloctest.dll"
 
 
--- a/sapi_location/tsrc/testing/tsapiloctotest/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_location/tsrc/testing/tsapiloctotest/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -21,11 +21,11 @@
 PRJ_PLATFORMS
 DEFAULT
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 ../conf/tsapiloctotest.cfg	/epoc32/WINSCW/C/TestFramework/tsapiloctotest.cfg
 
 
-PRJ_MMPFILES
+PRJ_TESTMMPFILES
 tsapiloctotest.mmp
 
 //  End of File
\ No newline at end of file
--- a/sapi_location/tsrc/testing/tsapiloctotest/group/tsapiloctotest.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_location/tsrc/testing/tsapiloctotest/group/tsapiloctotest.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Loggingservice binaries
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\locationservice.dll"-"C:\sys\bin\locationservice.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\locationservice.dll"-"C:\sys\bin\locationservice.dll"
 "..\..\..\..\..\..\..\epoc32\release\armv5\urel\tsapiloctotest.dll"-"C:\sys\bin\tsapiloctotest.dll"
 
 
--- a/sapi_logging/tsrc/dev/tloggingprovidertest/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_logging/tsrc/dev/tloggingprovidertest/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -24,22 +24,21 @@
 DEFAULT
 
 PRJ_TESTEXPORTS
-// NOTE: If using ARS requirements all export operations should be done under this.
-// 'abld test export'
-
-PRJ_EXPORTS
-
 ../conf/tloggingprovidertest.cfg	/epoc32/WINSCW/C/TestFramework/tloggingprovidertest.cfg
 
 #ifndef __TOP_LEVEL_BUILD__
 //Testframework.ini  /epoc32/WINSCW/C/TestFramework/Testframework.ini 
 #endif
+
+PRJ_EXPORTS
+
+
 PRJ_TESTMMPFILES
-
+tloggingprovidertest.mmp
 
 PRJ_MMPFILES
 
 
-tloggingprovidertest.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_logging/tsrc/dev/tloggingprovidertest/group/tloggingprovidertest.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_logging/tsrc/dev/tloggingprovidertest/group/tloggingprovidertest.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Loggingservice binaries
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\loggingservice.dll"-"C:\sys\bin\loggingservice.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\loggingservice.dll"-"C:\sys\bin\loggingservice.dll"
 "..\..\..\..\..\..\..\epoc32\release\armv5\urel\tloggingprovidertest.dll"-"C:\sys\bin\tloggingprovidertest.dll"
 
 
--- a/sapi_logging/tsrc/dev/tloggingservice/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_logging/tsrc/dev/tloggingservice/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -24,10 +24,6 @@
 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
@@ -39,11 +35,10 @@
 /agnmodel/inc/AGMCOMON.H
 */
 
+PRJ_EXPORTS
+
+
 PRJ_TESTMMPFILES
-// NOTE: If using ARS requirements .mmp file operation should be done under this.
-// 'abld test build'
-
-PRJ_MMPFILES
 // Specify the .mmp files required for building the important component
 // releasables.
 //
@@ -59,4 +54,7 @@
 */
 tloggingservice.mmp
 
+PRJ_MMPFILES
+
+
 //  End of File
\ No newline at end of file
--- a/sapi_logging/tsrc/dev/tloggingservice/group/tloggingservice.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_logging/tsrc/dev/tloggingservice/group/tloggingservice.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Loggingservice binaries
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\loggingservice.dll"-"C:\sys\bin\loggingservice.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\loggingservice.dll"-"C:\sys\bin\loggingservice.dll"
 "..\..\..\..\..\..\..\epoc32\release\armv5\urel\tloggingservice.dll"-"C:\sys\bin\tloggingservice.dll"
 
 
--- a/sapi_logging/tsrc/dev/tlogtypeidtest/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_logging/tsrc/dev/tlogtypeidtest/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -21,11 +21,15 @@
 PRJ_PLATFORMS
 DEFAULT
 
-
+PRJ_TESTEXPORTS
+../conf/tlogtypeidtest.cfg 		/epoc32/winscw/c/testframework/tlogtypeidtest.cfg
 
 PRJ_EXPORTS
-../conf/tlogtypeidtest.cfg 		/epoc32/winscw/c/testframework/tlogtypeidtest.cfg
+
+PRJ_TESTMMPFILES
+tlogtypeidtest.mmp
+
 
 PRJ_MMPFILES
-tlogtypeidtest.mmp
+
 //  End of File
\ No newline at end of file
--- a/sapi_logging/tsrc/dev/tlogtypeidtest/group/tlogtypeidtest.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_logging/tsrc/dev/tlogtypeidtest/group/tlogtypeidtest.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Loggingservice binaries
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\loggingservice.dll"-"C:\sys\bin\loggingservice.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\loggingservice.dll"-"C:\sys\bin\loggingservice.dll"
 "..\..\..\..\..\..\..\epoc32\release\armv5\urel\tlogtypeidtest.dll"-"C:\sys\bin\tlogtypeidtest.dll"
 
 
--- a/sapi_logging/tsrc/testing/tloggingservicetest/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_logging/tsrc/testing/tloggingservicetest/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -24,11 +24,6 @@
 DEFAULT
 
 PRJ_TESTEXPORTS
-// NOTE: If using ARS requirements all export operations should be done under this.
-// 'abld test export'
-
-PRJ_EXPORTS
-
 ../conf/tloggingservicetest.cfg     /epoc32/WINSCW/C/TestFramework/tloggingservicetest.cfg
 ../init/testframework.ini  /epoc32/WINSCW/C/TestFramework/testframework.ini 
 // Specify the source file followed by its destination here
@@ -40,11 +35,11 @@
 /agnmodel/inc/AGMCOMON.H
 */
 
+PRJ_EXPORTS
+
+
+
 PRJ_TESTMMPFILES
-// NOTE: If using ARS requirements .mmp file operation should be done under this.
-// 'abld test build'
-
-PRJ_MMPFILES
 // Specify the .mmp files required for building the important component
 // releasables.
 //
@@ -60,4 +55,7 @@
 */
 tloggingservicetest.mmp
 
+PRJ_MMPFILES
+
+
 //  End of File
\ No newline at end of file
--- a/sapi_logging/tsrc/testing/tloggingservicetest/group/tloggingservicetest.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_logging/tsrc/testing/tloggingservicetest/group/tloggingservicetest.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Loggingservice binaries
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\loggingservice.dll"-"C:\sys\bin\loggingservice.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\loggingservice.dll"-"C:\sys\bin\loggingservice.dll"
 "..\..\..\..\..\..\..\epoc32\release\armv5\urel\tloggingservicetest.dll"-"C:\sys\bin\tloggingservicetest.dll"
 
 
--- a/sapi_logging/tsrc/testing/tlogprovidertest/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_logging/tsrc/testing/tlogprovidertest/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -24,12 +24,6 @@
 DEFAULT
 
 PRJ_TESTEXPORTS
-
-
-// NOTE: If using ARS requirements all export operations should be done under this.
-// 'abld test export'
-
-PRJ_EXPORTS
 ../conf/tlogprovidertest.cfg     /epoc32/WINSCW/C/TestFramework/tlogprovidertest.cfg
 //Testframework.ini  /epoc32/WINSCW/C/TestFramework/Testframework.ini 
 // Specify the source file followed by its destination here
@@ -41,11 +35,10 @@
 /agnmodel/inc/AGMCOMON.H
 */
 
+PRJ_EXPORTS
+
+
 PRJ_TESTMMPFILES
-// NOTE: If using ARS requirements .mmp file operation should be done under this.
-// 'abld test build'
-
-PRJ_MMPFILES
 // Specify the .mmp files required for building the important component
 // releasables.
 //
@@ -61,4 +54,7 @@
 */
 tlogprovidertest.mmp
 
+PRJ_MMPFILES
+
+
 //  End of File
\ No newline at end of file
--- a/sapi_logging/tsrc/testing/tlogprovidertest/group/tlogprovidertest.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_logging/tsrc/testing/tlogprovidertest/group/tlogprovidertest.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Loggingservice binaries
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\loggingservice.dll"-"C:\sys\bin\loggingservice.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\loggingservice.dll"-"C:\sys\bin\loggingservice.dll"
 "..\..\..\..\..\..\..\epoc32\release\armv5\urel\tlogprovidertest.dll"-"C:\sys\bin\tlogprovidertest.dll"
 
 
--- a/sapi_mediamanagement/tsrc/dev/taiwmediamgmttest/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_mediamanagement/tsrc/dev/taiwmediamgmttest/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -38,6 +38,7 @@
 */
 
 PRJ_TESTMMPFILES
+taiwmediamgmttest.mmp
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
 
@@ -55,6 +56,5 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-taiwmediamgmttest.mmp
 
 //  End of File
\ No newline at end of file
--- a/sapi_mediamanagement/tsrc/dev/taiwmediamgmttest/group/taiwmediamgmttest.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_mediamanagement/tsrc/dev/taiwmediamgmttest/group/taiwmediamgmttest.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Mediamgmtservice binaries
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\mediamanagementservice.dll"-"C:\sys\bin\mediamanagementservice.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\mediamanagementservice.dll"-"C:\sys\bin\mediamanagementservice.dll"
 "..\..\..\..\..\..\..\epoc32\release\armv5\urel\taiwmediamgmttest.dll"-"C:\sys\bin\taiwmediamgmttest.dll"
 
 
--- a/sapi_mediamanagement/tsrc/dev/tmediamgmtprovidertest/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_mediamanagement/tsrc/dev/tmediamgmtprovidertest/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -38,6 +38,7 @@
 */
 
 PRJ_TESTMMPFILES
+tmediamgmtprovidertest.mmp
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
 
@@ -55,6 +56,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-tmediamgmtprovidertest.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_mediamanagement/tsrc/dev/tmediamgmtprovidertest/group/tmediamgmtprovidertest.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_mediamanagement/tsrc/dev/tmediamgmtprovidertest/group/tmediamgmtprovidertest.pkg	Fri May 08 08:20:08 2009 +0300
@@ -1,5 +1,5 @@
-;
-; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+; ============================================================================
+; Copyright (c) 2007 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"
@@ -11,8 +11,12 @@
 ;
 ; Contributors:
 ;
-; Description:  
-;
+; Description:   package file for Service API package
+; ============================================================================
+
+;files.pkg
+; Languages
+; none -  English only by default
 &EN
 ; Installation header
 ; Only one component name as we only support English
@@ -46,4 +50,4 @@
   "\epoc32\release\ARMV5\urel\tmediamgmtprovidertest.dll"         -   "!:\Sys\Bin\tmediamgmtprovidertest.dll"
 
 ;TEST DLL
-  "\epoc32\release\ARMV5\urel\mediamanagementservice.dll"           -   "!:\Sys\Bin\mediamanagementservice.dll"
+; "\epoc32\release\ARMV5\urel\mediamanagementservice.dll"           -   "!:\Sys\Bin\mediamanagementservice.dll"
--- a/sapi_mediamanagement/tsrc/dev/tmediamgmttest/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_mediamanagement/tsrc/dev/tmediamgmttest/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -38,6 +38,7 @@
 */
 
 PRJ_TESTMMPFILES
+tmediamgmttest.mmp
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
 
@@ -55,6 +56,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-tmediamgmttest.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_mediamanagement/tsrc/dev/tmediamgmttest/group/tmediamgmttest.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_mediamanagement/tsrc/dev/tmediamgmttest/group/tmediamgmttest.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Mediaservice binaries
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\mediamanagementservice.dll"-"C:\sys\bin\mediamanagementservice.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\mediamanagementservice.dll"-"C:\sys\bin\mediamanagementservice.dll"
 "..\..\..\..\..\..\..\epoc32\release\armv5\urel\tmediamgmttest.dll"-"C:\sys\bin\tmediamgmttest.dll"
 
 
--- a/sapi_mediamanagement/tsrc/testing/performance/runtime_perf/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_mediamanagement/tsrc/testing/performance/runtime_perf/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -26,7 +26,7 @@
 PRJ_EXPORTS
 
 
-PRJ_MMPFILES
+PRJ_TESTMMPFILES
 getfileinfoperf.mmp
 
 //  End of File
--- a/sapi_mediamanagement/tsrc/testing/performance/s60_perf/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_mediamanagement/tsrc/testing/performance/s60_perf/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -17,12 +17,12 @@
 
 
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 
 ../inc/mgservice.h		/epoc32/include/sapi/CoreImp/mgservice.h
 ../inc/mgoperationobserver.h	/epoc32/include/sapi/CoreImp/mgoperationobserver.h
 ../inc/mgservice.hrh		/epoc32/include/sapi/CoreImp/mgservice.hrh
 
 
-PRJ_MMPFILES
+PRJ_TESTMMPFILES
 mediamanagementservice.mmp
--- a/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -23,9 +23,12 @@
 
 
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 ../conf/tmediaprovidertest.cfg 		/epoc32/winscw/c/testframework/tmediaprovidertest.cfg
 
-PRJ_MMPFILES
+PRJ_TESTMMPFILES
 tmediaprovidertest.mmp
-//  End of File
\ No newline at end of file
+//  End of File
+PRJ_EXPORTS
+
+PRJ_MMPFILES
\ No newline at end of file
--- a/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/group/tmediaprovidertest.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/group/tmediaprovidertest.pkg	Fri May 08 08:20:08 2009 +0300
@@ -1,5 +1,5 @@
-;
-; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+; ============================================================================
+; Copyright (c) 2007 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"
@@ -11,8 +11,12 @@
 ;
 ; Contributors:
 ;
-; Description:  
-;
+; Description:   package file for Service API package
+; ============================================================================
+
+;files.pkg
+; Languages
+; none -  English only by default
 &EN
 ; Installation header
 ; Only one component name as we only support English
@@ -41,7 +45,7 @@
   "../conf/tmediaprovidertest.cfg"        -   "!:\testframework\tmediaprovidertest.cfg"
 
 ; Main DLL
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\mediamanagementservice.dll"-"C:\sys\bin\mediamanagementservice.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\mediamanagementservice.dll"-"C:\sys\bin\mediamanagementservice.dll"
 "..\..\..\..\..\..\..\epoc32\release\armv5\urel\tmediaprovidertest.dll"-"C:\sys\bin\tmediaprovidertest.dll"
 
 
--- a/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/group/Bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/group/Bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -36,7 +36,7 @@
 \agnmodel\inc\AGMCOMON.H
 */
 
-PRJ_EXPORTS	
+PRJ_TESTEXPORTS
 ../conf/tmediamgmttest_image.cfg 					/epoc32/winscw/c/testframework/tmediamgmttest_image.cfg
 ../conf/tmediamgmttest_sound.cfg					/epoc32/winscw/c/testframework/tmediamgmttest_sound.cfg
 ../conf/tmediamgmttest_video.cfg 					/epoc32/winscw/c/testframework/tmediamgmttest_video.cfg
@@ -48,12 +48,15 @@
 
 
 
-PRJ_MMPFILES
+
+PRJ_TESTMMPFILES
 tmediaprovidertesting.mmp
 
 
 
-//PRJ_MMPFILES
+PRJ_EXPORTS
+
+PRJ_MMPFILES
 //tmediaprovidertesting_nrm.mmp
 
 // Specify the .mmp files required for building the important component
--- a/sapi_messaging/tsrc/dev/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/dev/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -26,6 +26,6 @@
 
 PRJ_MMPFILES
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 ../data/c/test1.jpg	/epoc32/WINSCW/C/data/images/test1.jpg
 ../data/c/test2.jpg	/epoc32/WINSCW/C/data/images/test2.jpg
--- a/sapi_messaging/tsrc/dev/group/messaging_mannual.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/dev/group/messaging_mannual.pkg	Fri May 08 08:20:08 2009 +0300
@@ -1,5 +1,5 @@
-;
-; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+; ============================================================================
+; Copyright (c) 2007 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"
@@ -11,8 +11,12 @@
 ;
 ; Contributors:
 ;
-; Description:  
-;
+; Description:   package file for Service API package
+; ============================================================================
+
+;files.pkg
+; Languages
+; none -  English only by default
 &EN
 ; Installation header
 ; Only one component name as we only support English
--- a/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -26,6 +26,7 @@
 PRJ_TESTEXPORTS
 // NOTE: If using ARS requirements all export operations should be done under this.
 // 'abld test export'
+../conf/tmsg_notificationiter3.cfg	/epoc32/WINSCW/C/TestFramework/tmsg_notificationiter3.cfg
 
 PRJ_EXPORTS
 // Specify the source file followed by its destination here
@@ -36,11 +37,12 @@
 /*
 /agnmodel/inc/AGMCOMON.H
 */
-../conf/tmsg_notificationiter3.cfg	/epoc32/WINSCW/C/TestFramework/tmsg_notificationiter3.cfg
+
 
 PRJ_TESTMMPFILES
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
+tmsg_notificationiter3.mmp
 
 PRJ_MMPFILES
 // Specify the .mmp files required for building the important component
@@ -56,6 +58,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-tmsg_notificationiter3.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/group/tmsg_notificationiter3.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/group/tmsg_notificationiter3.pkg	Fri May 08 08:20:08 2009 +0300
@@ -1,6 +1,3 @@
-; ============================================================================
-;  Name        : serviceapi.pkg
-;  Part of     : SAPI project
 ; ============================================================================
 ; Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
@@ -35,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Messagingservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\messagingservice.dll"-"C:\sys\bin\messagingservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\messagingservice.dll"-"C:\sys\bin\messagingservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tmsg_notificationiter3.dll"-"C:\sys\bin\tmsg_notificationiter3.dll"
 
 
--- a/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_changestatusiter3/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_changestatusiter3/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -26,6 +26,7 @@
 PRJ_TESTEXPORTS
 // NOTE: If using ARS requirements all export operations should be done under this.
 // 'abld test export'
+../conf/tmsg_changestatusiter3.cfg	/epoc32/WINSCW/C/TestFramework/tmsg_changestatusiter3.cfg
 
 PRJ_EXPORTS
 // Specify the source file followed by its destination here
@@ -36,11 +37,12 @@
 /*
 /agnmodel/inc/AGMCOMON.H
 */
-../conf/tmsg_changestatusiter3.cfg	/epoc32/WINSCW/C/TestFramework/tmsg_changestatusiter3.cfg
+
 
 PRJ_TESTMMPFILES
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
+tmsg_changestatusiter3.mmp
 
 PRJ_MMPFILES
 // Specify the .mmp files required for building the important component
@@ -56,6 +58,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-tmsg_changestatusiter3.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_changestatusiter3/group/tmsg_changestatusiter3.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_changestatusiter3/group/tmsg_changestatusiter3.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Messagingservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\messagingservice.dll"-"C:\sys\bin\messagingservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\messagingservice.dll"-"C:\sys\bin\messagingservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tmsg_changestatusiter3.dll"-"C:\sys\bin\tmsg_changestatusiter3.dll"
 
 
--- a/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_deletemessageiter3/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_deletemessageiter3/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -26,6 +26,7 @@
 PRJ_TESTEXPORTS
 // NOTE: If using ARS requirements all export operations should be done under this.
 // 'abld test export'
+../conf/tmsg_deletemessageiter3.cfg	/epoc32/WINSCW/C/TestFramework/tmsg_deletemessageiter3.cfg
 
 PRJ_EXPORTS
 // Specify the source file followed by its destination here
@@ -36,11 +37,12 @@
 /*
 /agnmodel/inc/AGMCOMON.H
 */
-../conf/tmsg_deletemessageiter3.cfg	/epoc32/WINSCW/C/TestFramework/tmsg_deletemessageiter3.cfg
+
 
 PRJ_TESTMMPFILES
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
+tmsg_deletemessageiter3.mmp
 
 PRJ_MMPFILES
 // Specify the .mmp files required for building the important component
@@ -56,6 +58,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-tmsg_deletemessageiter3.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_deletemessageiter3/group/tmsg_deletemessageiter3.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_deletemessageiter3/group/tmsg_deletemessageiter3.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Messagingservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\messagingservice.dll"-"C:\sys\bin\messagingservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\messagingservice.dll"-"C:\sys\bin\messagingservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tmsg_deletemessageiter3.dll"-"C:\sys\bin\tmsg_deletemessageiter3.dll"
 
 
--- a/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -21,11 +21,19 @@
 PRJ_PLATFORMS
 DEFAULT
 
-
+PRJ_TESTEXPORTS
+// NOTE: If using ARS requirements all export operations should be done under this.
+// 'abld test export'
+../conf/tmsg_getheaderlistiter3.cfg  		/epoc32/winscw/c/testframework/tmsg_getheaderlistiter3.cfg
 
 PRJ_EXPORTS
-../conf/tmsg_getheaderlistiter3.cfg  		/epoc32/winscw/c/testframework/tmsg_getheaderlistiter3.cfg
+
+
+PRJ_TESTMMPFILES
+// NOTE: If using ARS requirements .mmp file operation should be done under this.
+// 'abld test build'
+tmsg_getheaderlistiter3.mmp
 
 PRJ_MMPFILES
-tmsg_getheaderlistiter3.mmp
+
 //  End of File
\ No newline at end of file
--- a/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/group/tmsg_getheaderlistiter3.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/group/tmsg_getheaderlistiter3.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Messagingservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\messagingservice.dll"-"C:\sys\bin\messagingservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\messagingservice.dll"-"C:\sys\bin\messagingservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tmsg_getheaderlistiter3.dll"-"C:\sys\bin\tmsg_getheaderlistiter3.dll"
 
 
--- a/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_misccases/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_misccases/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -21,11 +21,20 @@
 PRJ_PLATFORMS
 DEFAULT
 
-
+PRJ_TESTEXPORTS
+// NOTE: If using ARS requirements all export operations should be done under this.
+// 'abld test export'
+../conf/tmsg_misccases.cfg  		/epoc32/winscw/c/testframework/tmsg_misccases.cfg
 
 PRJ_EXPORTS
-../conf/tmsg_misccases.cfg  		/epoc32/winscw/c/testframework/tmsg_misccases.cfg
+
+
+PRJ_TESTMMPFILES
+// NOTE: If using ARS requirements .mmp file operation should be done under this.
+// 'abld test build'
+tmsg_misccases.mmp
+
 
 PRJ_MMPFILES
-tmsg_misccases.mmp
+
 //  End of File
\ No newline at end of file
--- a/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_misccases/group/tmsg_misccases.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_misccases/group/tmsg_misccases.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Messagingservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\messagingservice.dll"-"C:\sys\bin\messagingservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\messagingservice.dll"-"C:\sys\bin\messagingservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tmsg_misccases.dll"-"C:\sys\bin\tmsg_misccases.dll"
 
 
--- a/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -21,11 +21,22 @@
 PRJ_PLATFORMS
 DEFAULT
 
-
+PRJ_TESTEXPORTS
+// NOTE: If using ARS requirements all export operations should be done under this.
+// 'abld test export'
+../conf/tmsg_negitivecases.cfg 		/epoc32/winscw/c/testframework/tmsg_negitivecases.cfg
 
 PRJ_EXPORTS
-../conf/tmsg_negitivecases.cfg 		/epoc32/winscw/c/testframework/tmsg_negitivecases.cfg
+
+
+PRJ_TESTMMPFILES
+// NOTE: If using ARS requirements .mmp file operation should be done under this.
+// 'abld test build'
+tmsg_negitivecases.mmp
+
 
 PRJ_MMPFILES
-tmsg_negitivecases.mmp
+
+
+
 //  End of File
\ No newline at end of file
--- a/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/group/tmsg_negitivecases.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/group/tmsg_negitivecases.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Messagingservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\messagingservice.dll"-"C:\sys\bin\messagingservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\messagingservice.dll"-"C:\sys\bin\messagingservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tmsg_negitivecases.dll"-"C:\sys\bin\tmsg_negitivecases.dll"
 
 
--- a/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_sendmessageiter3/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_sendmessageiter3/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -21,11 +21,25 @@
 PRJ_PLATFORMS
 DEFAULT
 
-
+PRJ_TESTEXPORTS
+// NOTE: If using ARS requirements all export operations should be done under this.
+// 'abld test export'
+../conf/tmsg_sendmessageiter3.cfg  		/epoc32/winscw/c/testframework/tmsg_sendmessageiter3.cfg
 
 PRJ_EXPORTS
-../conf/tmsg_sendmessageiter3.cfg  		/epoc32/winscw/c/testframework/tmsg_sendmessageiter3.cfg
+
+
+PRJ_TESTMMPFILES
+// NOTE: If using ARS requirements .mmp file operation should be done under this.
+// 'abld test build'
+tmsg_sendmessageiter3.mmp
+
 
 PRJ_MMPFILES
-tmsg_sendmessageiter3.mmp
+
+
+
+
+
+
 //  End of File
\ No newline at end of file
--- a/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_sendmessageiter3/group/tmsg_sendmessageiter3.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_sendmessageiter3/group/tmsg_sendmessageiter3.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Messagingservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\messagingservice.dll"-"C:\sys\bin\messagingservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\messagingservice.dll"-"C:\sys\bin\messagingservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tmsg_sendmessageiter3.dll"-"C:\sys\bin\tmsg_sendmessageiter3.dll"
 
 
--- a/sapi_messaging/tsrc/dev/tmessagingtest/manual/tmsg_notificationiter1/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/dev/tmessagingtest/manual/tmsg_notificationiter1/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -26,6 +26,7 @@
 PRJ_TESTEXPORTS
 // NOTE: If using ARS requirements all export operations should be done under this.
 // 'abld test export'
+../conf/tmsg_notificationiter1.cfg	/epoc32/WINSCW/C/TestFramework/tmsg_notificationiter1.cfg
 
 PRJ_EXPORTS
 // Specify the source file followed by its destination here
@@ -36,11 +37,12 @@
 /*
 /agnmodel/inc/AGMCOMON.H
 */
-../conf/tmsg_notificationiter1.cfg	/epoc32/WINSCW/C/TestFramework/tmsg_notificationiter1.cfg
+
 
 PRJ_TESTMMPFILES
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
+tmsg_notificationiter1.mmp
 
 PRJ_MMPFILES
 // Specify the .mmp files required for building the important component
@@ -56,6 +58,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-tmsg_notificationiter1.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_messaging/tsrc/dev/tmessagingtest/manual/tmsg_notificationiter1/group/tmsg_notificationiter1.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/dev/tmessagingtest/manual/tmsg_notificationiter1/group/tmsg_notificationiter1.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Messagingservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\messagingservice.dll"-"C:\sys\bin\messagingservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\messagingservice.dll"-"C:\sys\bin\messagingservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tmsg_notificationiter1.dll"-"C:\sys\bin\tmsg_notificationiter1.dll"
 
 
--- a/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_changestatusiter1/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_changestatusiter1/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -26,6 +26,7 @@
 PRJ_TESTEXPORTS
 // NOTE: If using ARS requirements all export operations should be done under this.
 // 'abld test export'
+../conf/tmsg_changestatusiter1.cfg	/epoc32/WINSCW/C/TestFramework/tmsg_changestatusiter1.cfg
 
 PRJ_EXPORTS
 // Specify the source file followed by its destination here
@@ -36,11 +37,12 @@
 /*
 /agnmodel/inc/AGMCOMON.H
 */
-../conf/tmsg_changestatusiter1.cfg	/epoc32/WINSCW/C/TestFramework/tmsg_changestatusiter1.cfg
+
 
 PRJ_TESTMMPFILES
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
+tmsg_changestatusiter1.mmp
 
 PRJ_MMPFILES
 // Specify the .mmp files required for building the important component
@@ -56,6 +58,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-tmsg_changestatusiter1.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_changestatusiter1/group/tmsg_changestatusiter1.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_changestatusiter1/group/tmsg_changestatusiter1.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Messagingservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\messagingservice.dll"-"C:\sys\bin\messagingservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\messagingservice.dll"-"C:\sys\bin\messagingservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tmsg_changestatusiter1.dll"-"C:\sys\bin\tmsg_changestatusiter1.dll"
 
 
--- a/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_deletemessageiter1/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_deletemessageiter1/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -26,6 +26,7 @@
 PRJ_TESTEXPORTS
 // NOTE: If using ARS requirements all export operations should be done under this.
 // 'abld test export'
+../conf/tmsg_deletemessageiter1.cfg	/epoc32/WINSCW/C/TestFramework/tmsg_deletemessageiter1.cfg
 
 PRJ_EXPORTS
 // Specify the source file followed by its destination here
@@ -36,11 +37,12 @@
 /*
 /agnmodel/inc/AGMCOMON.H
 */
-../conf/tmsg_deletemessageiter1.cfg	/epoc32/WINSCW/C/TestFramework/tmsg_deletemessageiter1.cfg
+
 
 PRJ_TESTMMPFILES
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
+tmsg_deletemessageiter1.mmp
 
 PRJ_MMPFILES
 // Specify the .mmp files required for building the important component
@@ -56,6 +58,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-tmsg_deletemessageiter1.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_deletemessageiter1/group/tmsg_deletemessageiter1.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_deletemessageiter1/group/tmsg_deletemessageiter1.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Messagingservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\messagingservice.dll"-"C:\sys\bin\messagingservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\messagingservice.dll"-"C:\sys\bin\messagingservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tmsg_deletemessageiter1.dll"-"C:\sys\bin\tmsg_deletemessageiter1.dll"
 
 
--- a/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -22,10 +22,19 @@
 DEFAULT
 
 
-
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
+// NOTE: If using ARS requirements all export operations should be done under this.
+// 'abld test export'
 ../conf/tmsg_getheaderlistiter1.cfg  		/epoc32/winscw/c/testframework/tmsg_getheaderlistiter1.cfg
 
-PRJ_MMPFILES
+PRJ_EXPORTS
+
+
+PRJ_TESTMMPFILES
+// NOTE: If using ARS requirements .mmp file operation should be done under this.
+// 'abld test build'
 tmsg_getheaderlistiter1.mmp
+
+PRJ_MMPFILES
+
 //  End of File
\ No newline at end of file
--- a/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/group/tmsg_getheaderlistiter1.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/group/tmsg_getheaderlistiter1.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Messagingservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\messagingservice.dll"-"C:\sys\bin\messagingservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\messagingservice.dll"-"C:\sys\bin\messagingservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tmsg_getheaderlistiter1.dll"-"C:\sys\bin\tmsg_getheaderlistiter1.dll"
 
 
--- a/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -21,12 +21,21 @@
 PRJ_PLATFORMS
 DEFAULT
 
-
-
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
+// NOTE: If using ARS requirements all export operations should be done under this.
+// 'abld test export'
 ../conf/tmsg_sendmessageiter1.cfg 		/epoc32/winscw/c/testframework/tmsg_sendmessageiter1.cfg
 ../conf/tmsg_sendmessageiter1_manual.cfg 		/epoc32/winscw/c/testframework/tmsg_sendmessageiter1_manual.cfg
-PRJ_MMPFILES
+
+PRJ_EXPORTS
+
+
+PRJ_TESTMMPFILES
+// NOTE: If using ARS requirements .mmp file operation should be done under this.
+// 'abld test build'
 tmsg_sendmessageiter1.mmp
 
+PRJ_MMPFILES
+
+
 //  End of File
\ No newline at end of file
--- a/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/group/tmsg_sendmessageiter1.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/group/tmsg_sendmessageiter1.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Messagingservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\messagingservice.dll"-"C:\sys\bin\messagingservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\messagingservice.dll"-"C:\sys\bin\messagingservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tmsg_sendmessageiter1.dll"-"C:\sys\bin\tmsg_sendmessageiter1.dll"
 
 
--- a/sapi_messaging/tsrc/testing/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/testing/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -35,6 +35,6 @@
 
 PRJ_MMPFILES
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 ../data/c/ant.jpg	/epoc32/WINSCW/C/data/images/ant.jpg
 ../data/c/dhoom2whis192701.mp3	/epoc32/WINSCW/C/data/sounds/digital/dhoom2whis192701.mp3
\ No newline at end of file
--- a/sapi_messaging/tsrc/testing/group/testing.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/testing/group/testing.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Messagingservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\messagingservice.dll"-"C:\sys\bin\messagingservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\messagingservice.dll"-"C:\sys\bin\messagingservice.dll"
 
 
 "../data/c/ant.jpg" - "C:/data/images/ant.jpg"
--- a/sapi_messaging/tsrc/testing/performance/asyncsend/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/testing/performance/asyncsend/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -20,11 +20,15 @@
 PRJ_PLATFORMS
 DEFAULT
 
+PRJ_TESTMMPFILES
+// NOTE: If using ARS requirements .mmp file operation should be done under this.
+// 'abld test build'
+asyncsend.mmp
 
 PRJ_EXPORTS
 
 
 PRJ_MMPFILES
-asyncsend.mmp
+
 
 //  End of File
--- a/sapi_messaging/tsrc/testing/performance/delete/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/testing/performance/delete/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -23,8 +23,12 @@
 
 PRJ_EXPORTS
 
+PRJ_TESTMMPFILES
+// NOTE: If using ARS requirements .mmp file operation should be done under this.
+// 'abld test build'
+delete.mmp
 
 PRJ_MMPFILES
-delete.mmp
+
 
 //  End of File
--- a/sapi_messaging/tsrc/testing/performance/getlist/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/testing/performance/getlist/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -23,8 +23,12 @@
 
 PRJ_EXPORTS
 
+PRJ_TESTMMPFILES
+// NOTE: If using ARS requirements .mmp file operation should be done under this.
+// 'abld test build'
+getlist.mmp
 
 PRJ_MMPFILES
-getlist.mmp
+
 
 //  End of File
--- a/sapi_messaging/tsrc/testing/performance/notify/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/testing/performance/notify/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -23,8 +23,12 @@
 
 PRJ_EXPORTS
 
+PRJ_TESTMMPFILES
+// NOTE: If using ARS requirements .mmp file operation should be done under this.
+// 'abld test build'
+notify.mmp
 
 PRJ_MMPFILES
-notify.mmp
+
 
 //  End of File
--- a/sapi_messaging/tsrc/testing/performance/s60_asyncsend/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/testing/performance/s60_asyncsend/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -23,8 +23,12 @@
 
 PRJ_EXPORTS
 
+PRJ_TESTMMPFILES
+// NOTE: If using ARS requirements .mmp file operation should be done under this.
+// 'abld test build'
+s60_asyncsend.mmp
 
 PRJ_MMPFILES
-s60_asyncsend.mmp
+
 
 //  End of File
--- a/sapi_messaging/tsrc/testing/performance/s60_delete/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/testing/performance/s60_delete/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -23,8 +23,12 @@
 
 PRJ_EXPORTS
 
+PRJ_TESTMMPFILES
+// NOTE: If using ARS requirements .mmp file operation should be done under this.
+// 'abld test build'
+s60_delete.mmp
 
 PRJ_MMPFILES
-s60_delete.mmp
+
 
 //  End of File
--- a/sapi_messaging/tsrc/testing/performance/s60_getlist/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/testing/performance/s60_getlist/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -23,8 +23,12 @@
 
 PRJ_EXPORTS
 
+PRJ_TESTMMPFILES
+// NOTE: If using ARS requirements .mmp file operation should be done under this.
+// 'abld test build'
+s60_getlist.mmp
 
 PRJ_MMPFILES
-s60_getlist.mmp
+
 
 //  End of File
--- a/sapi_messaging/tsrc/testing/performance/s60_notify/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/testing/performance/s60_notify/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -23,8 +23,12 @@
 
 PRJ_EXPORTS
 
+PRJ_TESTMMPFILES
+// NOTE: If using ARS requirements .mmp file operation should be done under this.
+// 'abld test build'
+s60_notify.mmp
 
 PRJ_MMPFILES
-s60_notify.mmp
+
 
 //  End of File
--- a/sapi_messaging/tsrc/testing/performance/s60_send/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/testing/performance/s60_send/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -23,8 +23,12 @@
 
 PRJ_EXPORTS
 
+PRJ_TESTMMPFILES
+// NOTE: If using ARS requirements .mmp file operation should be done under this.
+// 'abld test build'
+s60_send.mmp
 
 PRJ_MMPFILES
-s60_send.mmp
+
 
 //  End of File
--- a/sapi_messaging/tsrc/testing/performance/s60_status/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/testing/performance/s60_status/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -23,8 +23,12 @@
 
 PRJ_EXPORTS
 
+PRJ_TESTMMPFILES
+// NOTE: If using ARS requirements .mmp file operation should be done under this.
+// 'abld test build'
+s60_status.mmp
 
 PRJ_MMPFILES
-s60_status.mmp
+
 
 //  End of File
--- a/sapi_messaging/tsrc/testing/performance/send/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/testing/performance/send/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -23,8 +23,12 @@
 
 PRJ_EXPORTS
 
+PRJ_TESTMMPFILES
+// NOTE: If using ARS requirements .mmp file operation should be done under this.
+// 'abld test build'
+send.mmp
 
 PRJ_MMPFILES
-send.mmp
+
 
 //  End of File
--- a/sapi_messaging/tsrc/testing/performance/status/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/testing/performance/status/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -23,8 +23,12 @@
 
 PRJ_EXPORTS
 
+PRJ_TESTMMPFILES
+// NOTE: If using ARS requirements .mmp file operation should be done under this.
+// 'abld test build'
+status.mmp
 
 PRJ_MMPFILES
-status.mmp
+
 
 //  End of File
--- a/sapi_messaging/tsrc/testing/tmessagingtest/async_send_message/group/async_send_message.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/testing/tmessagingtest/async_send_message/group/async_send_message.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Messagingservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\messagingservice.dll"-"C:\sys\bin\messagingservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\messagingservice.dll"-"C:\sys\bin\messagingservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\async_send_message.dll"-"C:\sys\bin\async_send_message.dll"
 
 
--- a/sapi_messaging/tsrc/testing/tmessagingtest/async_send_message/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/testing/tmessagingtest/async_send_message/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -40,6 +40,7 @@
 PRJ_TESTMMPFILES
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
+async_send_message.mmp
 
 PRJ_MMPFILES
 // Specify the .mmp files required for building the important component
@@ -55,6 +56,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-async_send_message.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_messaging/tsrc/testing/tmessagingtest/change_status_message/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/testing/tmessagingtest/change_status_message/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -40,6 +40,7 @@
 PRJ_TESTMMPFILES
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
+change_status_message.mmp
 
 PRJ_MMPFILES
 // Specify the .mmp files required for building the important component
@@ -55,6 +56,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-change_status_message.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_messaging/tsrc/testing/tmessagingtest/change_status_message/group/change_status_message.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/testing/tmessagingtest/change_status_message/group/change_status_message.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Messagingservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\messagingservice.dll"-"C:\sys\bin\messagingservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\messagingservice.dll"-"C:\sys\bin\messagingservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\change_status_message.dll"-"C:\sys\bin\change_status_message.dll"
 
 
--- a/sapi_messaging/tsrc/testing/tmessagingtest/delete_message/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/testing/tmessagingtest/delete_message/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -40,6 +40,7 @@
 PRJ_TESTMMPFILES
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
+delete_message.mmp
 
 PRJ_MMPFILES
 // Specify the .mmp files required for building the important component
@@ -55,6 +56,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-delete_message.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_messaging/tsrc/testing/tmessagingtest/delete_message/group/delete_message.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/testing/tmessagingtest/delete_message/group/delete_message.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Messagingservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\messagingservice.dll"-"C:\sys\bin\messagingservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\messagingservice.dll"-"C:\sys\bin\messagingservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\delete_message.dll"-"C:\sys\bin\delete_message.dll"
 
 
--- a/sapi_messaging/tsrc/testing/tmessagingtest/get_header_message/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/testing/tmessagingtest/get_header_message/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -40,6 +40,7 @@
 PRJ_TESTMMPFILES
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
+get_header_message.mmp
 
 PRJ_MMPFILES
 // Specify the .mmp files required for building the important component
@@ -55,6 +56,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-get_header_message.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_messaging/tsrc/testing/tmessagingtest/get_header_message/group/get_header_message.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/testing/tmessagingtest/get_header_message/group/get_header_message.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Messagingservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\messagingservice.dll"-"C:\sys\bin\messagingservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\messagingservice.dll"-"C:\sys\bin\messagingservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\get_header_message.dll"-"C:\sys\bin\get_header_message.dll"
 
 
--- a/sapi_messaging/tsrc/testing/tmessagingtest/register_message/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/testing/tmessagingtest/register_message/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -40,6 +40,7 @@
 PRJ_TESTMMPFILES
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
+register_message.mmp
 
 PRJ_MMPFILES
 // Specify the .mmp files required for building the important component
@@ -55,6 +56,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-register_message.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_messaging/tsrc/testing/tmessagingtest/register_message/group/register_message.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/testing/tmessagingtest/register_message/group/register_message.pkg	Fri May 08 08:20:08 2009 +0300
@@ -1,5 +1,5 @@
-;
-; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+; ============================================================================
+; Copyright (c) 2007 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"
@@ -11,8 +11,12 @@
 ;
 ; Contributors:
 ;
-; Description:  
-;
+; Description:   package file for Service API package
+; ============================================================================
+
+;files.pkg
+; Languages
+; none -  English only by default
 &EN
 ; Installation header
 ; Only one component name as we only support English
@@ -44,7 +48,7 @@
 ;CFG FILES
   "../conf/register_message.cfg"        -   "c:\testframework\register_message.cfg"
 
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\messagingservice.dll"-"C:\sys\bin\messagingservice.dll"  
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\messagingservice.dll"-"C:\sys\bin\messagingservice.dll"  
 ;TEST DLL
   "..\..\..\..\..\..\..\..\..\epoc32\release\ARMV5\urel\register_message.dll"           -   "!:\Sys\Bin\register_message.dll"
     
--- a/sapi_messaging/tsrc/testing/tmessagingtest/send_message/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/testing/tmessagingtest/send_message/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -40,6 +40,7 @@
 PRJ_TESTMMPFILES
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
+send_message.mmp
 
 PRJ_MMPFILES
 // Specify the .mmp files required for building the important component
@@ -55,6 +56,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-send_message.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_messaging/tsrc/testing/tmessagingtest/send_message/group/send_message.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_messaging/tsrc/testing/tmessagingtest/send_message/group/send_message.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Messagingservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\messagingservice.dll"-"C:\sys\bin\messagingservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\messagingservice.dll"-"C:\sys\bin\messagingservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\send_message.dll"-"C:\sys\bin\send_message.dll"
 
 
--- a/sapi_sensor/tsrc/dev/sensrprovidertest/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sensor/tsrc/dev/sensrprovidertest/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -20,10 +20,17 @@
 DEFAULT
 
 PRJ_EXPORTS
+//All files under this section are been moved to PRJ_TESTEXPORTS
+
+PRJ_TESTEXPORTS
 ../conf/sensrprovidertest.cfg	/epoc32/WINSCW/C/TestFramework/sensrprovidertest.cfg
 ../conf/sensrprovidertest_manual.cfg	/epoc32/WINSCW/C/TestFramework/sensrprovidertest_manual.cfg
 
+
 PRJ_MMPFILES
+//mmmp file under this section is moved to PRJ_TESTMMPFILES
+
+PRJ_TESTMMPFILES
 sensrprovidertest.mmp
 
 //  End of File
\ No newline at end of file
--- a/sapi_sensor/tsrc/dev/sensrprovidertest/group/sensrprovidertest.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sensor/tsrc/dev/sensrprovidertest/group/sensrprovidertest.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Sensorservice binaries
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\sensorservice.dll"-"C:\sys\bin\sensorservice.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\sensorservice.dll"-"C:\sys\bin\sensorservice.dll"
 "..\..\..\..\..\..\..\epoc32\release\armv5\urel\sensrprovidertest.dll"-"C:\sys\bin\sensrprovidertest.dll"
 
 
--- a/sapi_sensor/tsrc/dev/sensrservicetest/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sensor/tsrc/dev/sensrservicetest/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -22,8 +22,14 @@
 DEFAULT
 
 PRJ_EXPORTS
+//All files under this section are been moved to PRJ_TESTEXPORTS
+
+PRJ_TESTEXPORTS
 ../conf/sensrservicetest.cfg               /epoc32/winscw/c/testframework/sensrservicetest.cfg
 ../conf/sensrservicetest_manual.cfg               /epoc32/winscw/c/testframework/sensrservicetest_manual.cfg
 
 PRJ_MMPFILES
+//mmmp file under this section is moved to PRJ_TESTMMPFILES
+
+PRJ_TESTMMPFILES
 sensrservicetest.mmp
--- a/sapi_sensor/tsrc/dev/sensrservicetest/group/sensrservicetest.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sensor/tsrc/dev/sensrservicetest/group/sensrservicetest.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Sensorservice binaries
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\sensorservice.dll"-"C:\sys\bin\sensorservice.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\sensorservice.dll"-"C:\sys\bin\sensorservice.dll"
 "..\..\..\..\..\..\..\epoc32\release\armv5\urel\sensrservicetest.dll"-"C:\sys\bin\sensrservicetest.dll"
 
 
--- a/sapi_sensor/tsrc/dev/tsnsrprovidertest/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sensor/tsrc/dev/tsnsrprovidertest/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -15,16 +15,20 @@
 *
 */
 
-
-
 PRJ_PLATFORMS
 DEFAULT
 
 
 
 PRJ_EXPORTS
+//All files under this section are been moved to PRJ_TESTEXPORTS
+
+PRJ_TESTEXPORTS
 ../conf/tsnsrprovidertest.cfg 		/epoc32/winscw/c/testframework/tsnsrprovidertest.cfg
 
 PRJ_MMPFILES
+//mmmp file under this section is moved to PRJ_TESTMMPFILES
+
+PRJ_TESTMMPFILES
 tsnsrprovidertest.mmp
 //  End of File
\ No newline at end of file
--- a/sapi_sensor/tsrc/dev/tsnsrprovidertest/group/tsnsrprovidertest.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sensor/tsrc/dev/tsnsrprovidertest/group/tsnsrprovidertest.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Sensorservice binaries
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\sensorservice.dll"-"C:\sys\bin\sensorservice.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\sensorservice.dll"-"C:\sys\bin\sensorservice.dll"
 "..\..\..\..\..\..\..\epoc32\release\armv5\urel\tsnsrprovidertest.dll"-"C:\sys\bin\tsnsrprovidertest.dll"
 
 
--- a/sapi_sensor/tsrc/testing/tsensorservice_test/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sensor/tsrc/testing/tsensorservice_test/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -22,9 +22,15 @@
 DEFAULT
 
 PRJ_EXPORTS
+//All files under this section are been moved to PRJ_TESTEXPORTS
+
+PRJ_TESTEXPORTS
 ../conf/tsensorservice_test.cfg               /epoc32/winscw/c/testframework/tsensorservice_test.cfg
 
 PRJ_MMPFILES
+//mmmp file under this section is moved to PRJ_TESTMMPFILES
+
+PRJ_TESTMMPFILES
 tsensorservice_test.mmp
 
 //  End of File
\ No newline at end of file
--- a/sapi_sensor/tsrc/testing/tsensorservice_test/group/tsensorservice_test.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sensor/tsrc/testing/tsensorservice_test/group/tsensorservice_test.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Sensorservice binaries
-"..\..\..\..\..\..\..\epoc32\release\armv5\urel\sensorservice.dll"-"C:\sys\bin\contactservice.dll"
+;"..\..\..\..\..\..\..\epoc32\release\armv5\urel\sensorservice.dll"-"C:\sys\bin\contactservice.dll"
 "..\..\..\..\..\..\..\epoc32\release\armv5\urel\tsensorservice_test.dll"-"C:\sys\bin\tsensorservice_test.dll"
 
 
--- a/sapi_sysinfo/src/sysinfointerface.cpp	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sysinfo/src/sysinfointerface.cpp	Fri May 08 08:20:08 2009 +0300
@@ -711,8 +711,8 @@
             aOutMapParam->InsertL(KNetworkCode,networkinfo->NetworkCode());
             aOutMapParam->InsertL(KLocationStatus,
                                         networkinfo->ValidLocationAreaCode());
-            aOutMapParam->InsertL(KAreaCode,networkinfo->LocationAreaCode());
-            aOutMapParam->InsertL(KCellId,networkinfo->CellId());
+            aOutMapParam->InsertL(KAreaCode,(TInt32)networkinfo->LocationAreaCode());
+            aOutMapParam->InsertL(KCellId,(TInt32)networkinfo->CellId());
             }
             break;
         case CSysData::EConnectionInfo:
--- a/sapi_sysinfo/src/sysinfoobserver.cpp	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sysinfo/src/sysinfoobserver.cpp	Fri May 08 08:20:08 2009 +0300
@@ -86,7 +86,7 @@
     if ( aError != KErrNone )
         {
         SapiErr = iSysInfoIf->SapiError(aError);
-        eventParamList->AppendL(TLiwGenericParam(KErrorCode,TLiwVariant(SapiErr)));
+        eventParamList->AppendL(TLiwGenericParam(KErrorCode,TLiwVariant((TInt32)SapiErr)));
         TRAP_IGNORE(callback->HandleNotifyL(aTransID, KLiwEventError,
                                         *eventParamList,*inParamList));
         }
--- a/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -26,6 +26,8 @@
 PRJ_TESTEXPORTS
 // NOTE: If using ARS requirements all export operations should be done under this.
 // 'abld test export'
+../conf/tsysinfoprovidergeneraltests.cfg	/epoc32/WINSCW/C/TestFramework/tsysinfoprovidergeneraltests.cfg
+
 
 PRJ_EXPORTS
 // Specify the source file followed by its destination here
@@ -36,11 +38,13 @@
 /*
 /agnmodel/inc/AGMCOMON.H
 */
-../conf/tsysinfoprovidergeneraltests.cfg	/epoc32/WINSCW/C/TestFramework/tsysinfoprovidergeneraltests.cfg
+
 
 PRJ_TESTMMPFILES
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
+tsysinfoprovidergeneraltests.mmp
+
 
 PRJ_MMPFILES
 // Specify the .mmp files required for building the important component
@@ -56,6 +60,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-tsysinfoprovidergeneraltests.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/group/tsysinfoprovidergeneraltests.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/group/tsysinfoprovidergeneraltests.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;sysinfoservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\sysinfoservice.dll"-"C:\sys\bin\sysinfoservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\sysinfoservice.dll"-"C:\sys\bin\sysinfoservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tsysinfoprovidergeneraltests.dll"-"C:\sys\bin\tsysinfoprovidergeneraltests.dll"
 
 
--- a/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -26,16 +26,19 @@
 PRJ_TESTEXPORTS
 // NOTE: If using ARS requirements all export operations should be done under this.
 // 'abld test export'
+../conf/tsysinfoprovidernetworktests.cfg	/epoc32/WINSCW/C/TestFramework/tsysinfoprovidernetworktests.cfg
+
 
 PRJ_EXPORTS
 
-../conf/tsysinfoprovidernetworktests.cfg	/epoc32/WINSCW/C/TestFramework/tsysinfoprovidernetworktests.cfg
+
 
 PRJ_TESTMMPFILES
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
+tsysinfoprovidernetworktests.mmp
+
 
 PRJ_MMPFILES
-tsysinfoprovidernetworktests.mmp
 
 //  End of File
\ No newline at end of file
--- a/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/group/tsysinfoprovidernetworktests.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/group/tsysinfoprovidernetworktests.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Sysinfoservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\sysinfoservice.dll"-"C:\sys\bin\sysinfoservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\sysinfoservice.dll"-"C:\sys\bin\sysinfoservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tsysinfoprovidernetworktests.dll"-"C:\sys\bin\tsysinfoprovidernetworktests.dll"
 
 
--- a/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -22,14 +22,16 @@
 DEFAULT
 
 PRJ_TESTEXPORTS
+../conf/tsysinfoprovidernegativetests.cfg	/epoc32/WINSCW/C/TestFramework/tsysinfoprovidernegativetests.cfg
+
 
 PRJ_EXPORTS
-../conf/tsysinfoprovidernegativetests.cfg	/epoc32/WINSCW/C/TestFramework/tsysinfoprovidernegativetests.cfg
 
 
 PRJ_TESTMMPFILES
+tsysinfoprovidernegativetests.mmp
+
 
 PRJ_MMPFILES
-tsysinfoprovidernegativetests.mmp
 
 //  End of File
\ No newline at end of file
--- a/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/group/tsysinfoprovidernegativetests.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/group/tsysinfoprovidernegativetests.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Sysinfoservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\sysinfoservice.dll"-"C:\sys\bin\sysinfoservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\sysinfoservice.dll"-"C:\sys\bin\sysinfoservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tsysinfoprovidernegativetests.dll"-"C:\sys\bin\tsysinfoprovidernegativetests.dll"
 
 
--- a/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -22,14 +22,18 @@
 DEFAULT
 
 PRJ_TESTEXPORTS
+../conf/tsysinfoprovidertests.cfg	/epoc32/WINSCW/C/TestFramework/tsysinfoprovidertests.cfg
+
 
 PRJ_EXPORTS
-../conf/tsysinfoprovidertests.cfg	/epoc32/WINSCW/C/TestFramework/tsysinfoprovidertests.cfg
+
 
 
 PRJ_TESTMMPFILES
+tsysinfoprovidertests.mmp
+
 
 PRJ_MMPFILES
-tsysinfoprovidertests.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/group/tsysinfoprovidertests.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/group/tsysinfoprovidertests.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Sysinfoservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\sysinfoservice.dll"-"C:\sys\bin\sysinfoservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\sysinfoservice.dll"-"C:\sys\bin\sysinfoservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tsysinfoprovidertests.dll"-"C:\sys\bin\tsysinfoprovidertests.dll"
 
 
--- a/sapi_sysinfo/tsrc/dev/servicetests/manual/group/tsysinfomanualtests.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sysinfo/tsrc/dev/servicetests/manual/group/tsysinfomanualtests.pkg	Fri May 08 08:20:08 2009 +0300
@@ -1,5 +1,5 @@
-;
-; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+; ============================================================================
+; Copyright (c) 2007 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"
@@ -11,8 +11,13 @@
 ;
 ; Contributors:
 ;
-; Description:  
+; Description:   package file for Service API package
+; ============================================================================
+
+
+; sysinfo service manual tests
 ;
+;Language - standard language definitions
 &EN
 
 ; standard SIS file header
--- a/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfobattery/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfobattery/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -26,16 +26,19 @@
 PRJ_TESTEXPORTS
 // NOTE: If using ARS requirements all export operations should be done under this.
 // 'abld test export'
+../conf/tsysinfobattery.cfg	/epoc32/WINSCW/C/TestFramework/tsysinfobattery.cfg
+
 
 PRJ_EXPORTS
 
-../conf/tsysinfobattery.cfg	/epoc32/WINSCW/C/TestFramework/tsysinfobattery.cfg
 
 PRJ_TESTMMPFILES
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
+tsysinfobattery.mmp
+
 
 PRJ_MMPFILES
-tsysinfobattery.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfobattery/group/tsysinfobattery.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfobattery/group/tsysinfobattery.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Sysinfoservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\sysinfoservice.dll"-"C:\sys\bin\sysinfoservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\sysinfoservice.dll"-"C:\sys\bin\sysinfoservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tsysinfobattery.dll"-"C:\sys\bin\tsysinfobattery.dll"
 
 
--- a/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -26,6 +26,8 @@
 PRJ_TESTEXPORTS
 // NOTE: If using ARS requirements all export operations should be done under this.
 // 'abld test export'
+../conf/tsysinfogeneraltests.cfg	/epoc32/WINSCW/C/TestFramework/tsysinfogeneraltests.cfg
+
 
 PRJ_EXPORTS
 // Specify the source file followed by its destination here
@@ -36,11 +38,13 @@
 /*
 /agnmodel/inc/AGMCOMON.H
 */
-../conf/tsysinfogeneraltests.cfg	/epoc32/WINSCW/C/TestFramework/tsysinfogeneraltests.cfg
+
 
 PRJ_TESTMMPFILES
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
+tsysinfogeneraltests.mmp
+
 
 PRJ_MMPFILES
 // Specify the .mmp files required for building the important component
@@ -56,6 +60,6 @@
 /agnmodel/group/agsvexe.mmp
 #endif
 */
-tsysinfogeneraltests.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/group/tsysinfogeneraltests.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/group/tsysinfogeneraltests.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Sysinfoservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\sysinfoservice.dll"-"C:\sys\bin\sysinfoservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\sysinfoservice.dll"-"C:\sys\bin\sysinfoservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tsysinfogeneraltests.dll"-"C:\sys\bin\tsysinfogeneraltests.dll"
 
 
--- a/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -26,16 +26,20 @@
 PRJ_TESTEXPORTS
 // NOTE: If using ARS requirements all export operations should be done under this.
 // 'abld test export'
+../conf/tsysinfonetworktests.cfg	/epoc32/WINSCW/C/TestFramework/tsysinfonetworktests.cfg
+
 
 PRJ_EXPORTS
 
-../conf/tsysinfonetworktests.cfg	/epoc32/WINSCW/C/TestFramework/tsysinfonetworktests.cfg
+
 
 PRJ_TESTMMPFILES
 // NOTE: If using ARS requirements .mmp file operation should be done under this.
 // 'abld test build'
+tsysinfonetworktests.mmp
+
 
 PRJ_MMPFILES
-tsysinfonetworktests.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/group/tsysinfonetworktests.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/group/tsysinfonetworktests.pkg	Fri May 08 08:20:08 2009 +0300
@@ -31,8 +31,8 @@
 
 ;SAPI Binaries to Install
 
-;Loggingservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\Calendarservice.dll"-"C:\sys\bin\sysinfoservice.dll"
+;Sysinfoservice binaries
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\sysinfoservice.dll"-"C:\sys\bin\sysinfoservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tsysinfonetworktests.dll"-"C:\sys\bin\tsysinfonetworktests.dll"
 
 
--- a/sapi_sysinfo/tsrc/dev/servicetests/tsysinfoservicetests/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sysinfo/tsrc/dev/servicetests/tsysinfoservicetests/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -23,16 +23,17 @@
 DEFAULT
 
 PRJ_TESTEXPORTS
+../conf/tsysinfoservicetests.cfg	/epoc32/WINSCW/C/TestFramework/tsysinfoservicetests.cfg
 
 PRJ_EXPORTS
 
-../conf/tsysinfoservicetests.cfg	/epoc32/WINSCW/C/TestFramework/tsysinfoservicetests.cfg
+
 
 PRJ_TESTMMPFILES
-
+tsysinfoservicetests.mmp
 
 PRJ_MMPFILES
 
-tsysinfoservicetests.mmp
+
 
 //  End of File
\ No newline at end of file
--- a/sapi_sysinfo/tsrc/dev/servicetests/tsysinfoservicetests/group/tsysinfoservicetests.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sysinfo/tsrc/dev/servicetests/tsysinfoservicetests/group/tsysinfoservicetests.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;SysInfoservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\sysinfoservice.dll"-"C:\sys\bin\sysinfoservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\sysinfoservice.dll"-"C:\sys\bin\sysinfoservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tsysinfoservicetests.dll"-"C:\sys\bin\tsysinfoservicetests.dll"
 
 
--- a/sapi_sysinfo/tsrc/testing/tsysbattery/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sysinfo/tsrc/testing/tsysbattery/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -22,11 +22,11 @@
 DEFAULT
 
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 ../conf/tsysbattery.cfg /epoc32/winscw/c/testframework/tsysbattery.cfg
 
 
-PRJ_MMPFILES
+PRJ_TESTMMPFILES
 
 tsysbattery.mmp
 
--- a/sapi_sysinfo/tsrc/testing/tsysbattery/group/tsysbattery.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sysinfo/tsrc/testing/tsysbattery/group/tsysbattery.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;sysinfoservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\sysinfoservice.dll"-"C:\sys\bin\sysinfoservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\sysinfoservice.dll"-"C:\sys\bin\sysinfoservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tsysbattery.dll"-"C:\sys\bin\tsysbattery.dll"
 
 
--- a/sapi_sysinfo/tsrc/testing/tsysconnectivity/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sysinfo/tsrc/testing/tsysconnectivity/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -22,12 +22,12 @@
 
 DEFAULT
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 ../conf/tsysconnectivity.cfg /epoc32/winscw/c/testframework/tsysconnectivity.cfg
 
 
 
-PRJ_MMPFILES
+PRJ_TESTMMPFILES
 
 tsysconnectivity.mmp
 
--- a/sapi_sysinfo/tsrc/testing/tsysconnectivity/group/tsysconnectivity.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sysinfo/tsrc/testing/tsysconnectivity/group/tsysconnectivity.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;sysinfoservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\sysinfoservice.dll"-"C:\sys\bin\sysinfoservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\sysinfoservice.dll"-"C:\sys\bin\sysinfoservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tsysconnectivity.dll"-"C:\sys\bin\tsysconnectivity.dll"
 
 
--- a/sapi_sysinfo/tsrc/testing/tsysdevice/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sysinfo/tsrc/testing/tsysdevice/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -22,11 +22,11 @@
 DEFAULT
 
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 ../conf/tsysdevice.cfg /epoc32/winscw/c/testframework/tsysdevice.cfg
 
 
-PRJ_MMPFILES
+PRJ_TESTMMPFILES
 tsysdevice.mmp
 
 //  End of File
\ No newline at end of file
--- a/sapi_sysinfo/tsrc/testing/tsysdevice/group/tsysdevice.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sysinfo/tsrc/testing/tsysdevice/group/tsysdevice.pkg	Fri May 08 08:20:08 2009 +0300
@@ -31,8 +31,8 @@
 
 ;SAPI Binaries to Install
 
-;Loggingservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\sysinfoservice.dll"-"C:\sys\bin\sysinfoservice.dll"
+
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\sysinfoservice.dll"-"C:\sys\bin\sysinfoservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tsysdevice.dll"-"C:\sys\bin\tsysdevice.dll"
 
 
--- a/sapi_sysinfo/tsrc/testing/tsysdisplay/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sysinfo/tsrc/testing/tsysdisplay/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -23,7 +23,7 @@
 DEFAULT
 
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 ../conf/tsysdisplay.cfg /epoc32/winscw/c/testframework/tsysdisplay.cfg
 ../data/c/1.jpg		/epoc32/winscw/c/data/Images/sysinfotest1.jpg
 ../data/c/2.bmp		/epoc32/winscw/c/data/Images/sysinfotest2.bmp
@@ -31,7 +31,7 @@
 ../data/c/4.txt		/epoc32/winscw/c/data/Images/sysinfotest4.txt
 
 
-PRJ_MMPFILES
+PRJ_TESTMMPFILES
 tsysdisplay.mmp
 
 //  End of File
\ No newline at end of file
--- a/sapi_sysinfo/tsrc/testing/tsysdisplay/group/tsysdisplay.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sysinfo/tsrc/testing/tsysdisplay/group/tsysdisplay.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Sysinfoservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\sysinfoservice.dll"-"C:\sys\bin\sysinfoservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\sysinfoservice.dll"-"C:\sys\bin\sysinfoservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tsysdisplay.dll"-"C:\sys\bin\tsysdisplay.dll"
 
 
--- a/sapi_sysinfo/tsrc/testing/tsysfeatures/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sysinfo/tsrc/testing/tsysfeatures/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -22,10 +22,10 @@
 DEFAULT
 
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 ../conf/tsysfeatures.cfg /epoc32/winscw/c/testframework/tsysfeatures.cfg
 
-PRJ_MMPFILES
+PRJ_TESTMMPFILES
 tsysfeatures.mmp
 
 //  End of File
\ No newline at end of file
--- a/sapi_sysinfo/tsrc/testing/tsysfeatures/group/tsysfeatures.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sysinfo/tsrc/testing/tsysfeatures/group/tsysfeatures.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Sysinfoservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\sysinfoservice.dll"-"C:\sys\bin\sysinfoservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\sysinfoservice.dll"-"C:\sys\bin\sysinfoservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tsysfeatures.dll"-"C:\sys\bin\tsysfeatures.dll"
 
 
--- a/sapi_sysinfo/tsrc/testing/tsysgeneral/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sysinfo/tsrc/testing/tsysgeneral/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -23,10 +23,10 @@
 
 
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 ../conf/tsysgeneral.cfg /epoc32/winscw/c/testframework/tsysgeneral.cfg
 
-PRJ_MMPFILES
+PRJ_TESTMMPFILES
 tsysgeneral.mmp
 
 //  End of File
\ No newline at end of file
--- a/sapi_sysinfo/tsrc/testing/tsysgeneral/group/tsysgeneral.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sysinfo/tsrc/testing/tsysgeneral/group/tsysgeneral.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Sysinfoservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\sysinfoservice.dll"-"C:\sys\bin\sysinfoservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\sysinfoservice.dll"-"C:\sys\bin\sysinfoservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tsysgeneral.dll"-"C:\sys\bin\tsysgeneral.dll"
 
 
--- a/sapi_sysinfo/tsrc/testing/tsysmanualtest/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sysinfo/tsrc/testing/tsysmanualtest/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -23,11 +23,11 @@
 // defaults to WINS MARM so you can ignore this if you just build these
 DEFAULT
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 ../conf/tsysmanualtest.cfg /epoc32/winscw/c/testframework/tsysmanualtest.cfg
 
 
-PRJ_MMPFILES
+PRJ_TESTMMPFILES
 tsysmanualtest.mmp
 
 //  End of File
\ No newline at end of file
--- a/sapi_sysinfo/tsrc/testing/tsysmanualtest/group/tsysmanualtest.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sysinfo/tsrc/testing/tsysmanualtest/group/tsysmanualtest.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Sysinfoservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\sysinfoservice.dll"-"C:\sys\bin\sysinfoservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\sysinfoservice.dll"-"C:\sys\bin\sysinfoservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tsysmanualtest.dll"-"C:\sys\bin\tsysmanualtest.dll"
 
 
--- a/sapi_sysinfo/tsrc/testing/tsysmemory/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sysinfo/tsrc/testing/tsysmemory/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -22,10 +22,10 @@
 DEFAULT
 
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 ../conf/tsysmemory.cfg /epoc32/winscw/c/testframework/tsysmemory.cfg
 
-PRJ_MMPFILES
+PRJ_TESTMMPFILES
 tsysmemory.mmp
 
 //  End of File
\ No newline at end of file
--- a/sapi_sysinfo/tsrc/testing/tsysmemory/group/tsysmemory.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sysinfo/tsrc/testing/tsysmemory/group/tsysmemory.pkg	Fri May 08 08:20:08 2009 +0300
@@ -32,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Sysinfoservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\sysinfoservice.dll"-"C:\sys\bin\sysinfoservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\sysinfoservice.dll"-"C:\sys\bin\sysinfoservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tsysmemory.dll"-"C:\sys\bin\tsysmemory.dll"
 
 
--- a/sapi_sysinfo/tsrc/testing/tsysnetwork/group/bld.inf	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sysinfo/tsrc/testing/tsysnetwork/group/bld.inf	Fri May 08 08:20:08 2009 +0300
@@ -22,10 +22,10 @@
 DEFAULT
 
 
-PRJ_EXPORTS
+PRJ_TESTEXPORTS
 ../conf/tsysnetwork.cfg   /epoc32/WINSCW/C/TestFramework/tsysnetwork.cfg
 
-PRJ_MMPFILES
+PRJ_TESTMMPFILES
 
 tsysnetwork.mmp
 
--- a/sapi_sysinfo/tsrc/testing/tsysnetwork/group/tsysnetwork.pkg	Mon Mar 30 12:51:10 2009 +0300
+++ b/sapi_sysinfo/tsrc/testing/tsysnetwork/group/tsysnetwork.pkg	Fri May 08 08:20:08 2009 +0300
@@ -14,7 +14,6 @@
 ; Description:   package file for Service API package
 ; ============================================================================
 
-
 ;Languages
 &EN
 
@@ -33,7 +32,7 @@
 ;SAPI Binaries to Install
 
 ;Sysinfoservice binaries
-"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\sysinfoservice.dll"-"C:\sys\bin\sysinfoservice.dll"
+;"..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\sysinfoservice.dll"-"C:\sys\bin\sysinfoservice.dll"
 "..\..\..\..\..\..\..\..\..\epoc32\release\armv5\urel\tsysnetwork.dll"-"C:\sys\bin\tsysnetwork.dll"