Revision: 200937 PDK_3.0.a
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Thu, 24 Sep 2009 12:43:20 +0300
changeset 12 f4292e0e20df
parent 11 5c0037c72160
child 13 99266c6df7d1
child 16 44bb89c96acb
Revision: 200937 Kit: 200939
serviceproviders/install/serviceapi.pkg
serviceproviders/install/serviceapi_stub.pkg
serviceproviders/install/serviceapi_stub.sis
serviceproviders/sapi_applicationmanager/appmanagerservice/group/appmanagerservice.mmp
serviceproviders/sapi_applicationmanager/data/2000CFBA.rss
serviceproviders/sapi_applicationmanager/group/appmanagerprovider.mmp
serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrprovider/group/bld.inf
serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrtest/group/bld.inf
serviceproviders/sapi_calendar/calendarservice/group/calendarservice.mmp
serviceproviders/sapi_calendar/calendarservice/inc/calendargetlist.h
serviceproviders/sapi_calendar/calendarservice/src/calendargetlist.cpp
serviceproviders/sapi_calendar/data/2000CFB4.rss
serviceproviders/sapi_calendar/group/calendarprovider.mmp
serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendargetlistiter1/inc/calgetlisttestcases.h
serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendargetlistiter1/src/calgetlisttestcases.cpp
serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/inc/calendarinterface.h
serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/inc/calendarservice.h
serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_add/inc/calendarservice.h
serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/inc/calendarinterface.h
serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/inc/calendarservice.h
serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/inc/entryattributes.h
serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/inc/calendarservice.h
serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/inc/entryattributes.h
serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/inc/calendarservice.h
serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/inc/calendarservice.h
serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/inc/calgetlisttestcases.h
serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/inc/entryattributes.h
serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/src/calgetlisttestcases.cpp
serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/inc/calendarservice.h
serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_update/inc/calendarservice.h
serviceproviders/sapi_contacts_vpbk/contactservice/group/contactservice.mmp
serviceproviders/sapi_contacts_vpbk/contactservice/inc/getliststorelistobserver.h
serviceproviders/sapi_contacts_vpbk/contactservice/src/singlecontact.cpp
serviceproviders/sapi_contacts_vpbk/data/0x102833A7.rss
serviceproviders/sapi_contacts_vpbk/group/contactprovider.mmp
serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsgetidsprovidertest/conf/tcontactsgetidsprovidertest.cfg
serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsgetidsprovidertest/group/tcontactsgetidsprovidertest.pkg
serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsgetidsprovidertest/inc/tcontactsgetidsprovidertest.h
serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsgetidsprovidertest/inc/tcontactsgetidsprovidertest.hrh
serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsgetidsprovidertest/src/tcontactsgetidsprovidertestblocks.cpp
serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getIds/conf/tcontact_getIds.cfg
serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getIds/inc/tcontact_getIds.h
serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getIds/src/tcontact_getIdsblocks.cpp
serviceproviders/sapi_landmarks/data/landmarkprovider.rls
serviceproviders/sapi_landmarks/group/landmarkprovider.mmp
serviceproviders/sapi_landmarks/landmarksservice/group/landmarkservice.mmp
serviceproviders/sapi_location/data/102833ab.rss
serviceproviders/sapi_location/group/locationprovider.mmp
serviceproviders/sapi_location/locationservice/group/locationservice.mmp
serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/TraceTO.cpp
serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tenableHighAcc.cpp
serviceproviders/sapi_logging/data/2000CFBC.rss
serviceproviders/sapi_logging/group/loggingprovider.mmp
serviceproviders/sapi_logging/loggingservice/group/loggingservice.mmp
serviceproviders/sapi_mediamanagement/data/102833AD.rss
serviceproviders/sapi_mediamanagement/group/mediamanagementprovider.mmp
serviceproviders/sapi_mediamanagement/mediamanagementservice/group/mediamanagementservice.mmp
serviceproviders/sapi_messaging/data/102833AF.rss
serviceproviders/sapi_messaging/group/messagingprovider.mmp
serviceproviders/sapi_messaging/messagingservice/group/messagingservice.mmp
serviceproviders/sapi_sensor/data/2000CFB6.rss
serviceproviders/sapi_sensor/group/sensorprovider.mmp
serviceproviders/sapi_sensor/sensorservice/group/sensorservice.mmp
serviceproviders/sapi_serviceregistry/data/102833a9.rss
serviceproviders/sapi_serviceregistry/group/serviceregistryprovider.mmp
serviceproviders/sapi_sysinfo/data/sysinfoprovider.rls
serviceproviders/sapi_sysinfo/group/sysinfoprovider.mmp
serviceproviders/sapi_sysinfo/sysinfoservice/group/sysinfoservice.mmp
--- a/serviceproviders/install/serviceapi.pkg	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/install/serviceapi.pkg	Thu Sep 24 12:43:20 2009 +0300
@@ -18,7 +18,7 @@
 &EN
 
 ;Header
-#{"Platform Service Extensions"},(0x200100BE),1,0,1, TYPE=SA,RU
+#{"Platform Service Extensions"},(0x200100BE),1,1,0, TYPE=SA,RU
 
 ; S60 5.0 dependency
 [0x1028315F], 0, 0, 0, {"Series60ProductID"}
--- a/serviceproviders/install/serviceapi_stub.pkg	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/install/serviceapi_stub.pkg	Thu Sep 24 12:43:20 2009 +0300
@@ -18,7 +18,7 @@
 &EN
 
 ;Header
-#{"Platform Service Extensions"},(0x200100BE),1,0,0, TYPE=SA
+#{"Platform Service Extensions"},(0x200100BE),1,1,0, TYPE=SA
 
 ;Localised Vendor name
 %{"Nokia"}
Binary file serviceproviders/install/serviceapi_stub.sis has changed
--- a/serviceproviders/sapi_applicationmanager/appmanagerservice/group/appmanagerservice.mmp	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_applicationmanager/appmanagerservice/group/appmanagerservice.mmp	Thu Sep 24 12:43:20 2009 +0300
@@ -33,7 +33,7 @@
 
 DEFFILE        appmanagerservice.def
 
-VERSION		1.0
+VERSION		1.1
 
 
 
--- a/serviceproviders/sapi_applicationmanager/data/2000CFBA.rss	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_applicationmanager/data/2000CFBA.rss	Thu Sep 24 12:43:20 2009 +0300
@@ -39,7 +39,7 @@
                     version_no = 1;
                     display_name = "Application Manager Service Provider";
                     default_data = "Service.AppManager";
-                    opaque_data = "IAppManager" "::" "<meta><cap>RUD</cap><res>appmanagerprovidername.rsc</res></meta>";
+                    opaque_data = "IAppManager" "::" "<meta><cap>RUD</cap><ver>1.1</ver><res>appmanagerprovidername.rsc</res></meta>";
                     }
                 };
             }
--- a/serviceproviders/sapi_applicationmanager/group/appmanagerprovider.mmp	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_applicationmanager/group/appmanagerprovider.mmp	Thu Sep 24 12:43:20 2009 +0300
@@ -27,7 +27,7 @@
 EPOCSTACKSIZE   0x5000
 
 DEFFILE         appmanagerinterface.def
-VERSION		1.0
+VERSION		1.1
 
 
 CAPABILITY      CAP_ECOM_PLUGIN
--- a/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrprovider/group/bld.inf	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrprovider/group/bld.inf	Thu Sep 24 12:43:20 2009 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002 - 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,12 +11,11 @@
 *
 * Contributors:
 *
-* Description:  tgetlistapplication.mmp
+* Description:   ?Description
 *
 */
 
 
-
 PRJ_PLATFORMS
 DEFAULT
 
--- a/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrtest/group/bld.inf	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrtest/group/bld.inf	Thu Sep 24 12:43:20 2009 +0300
@@ -11,12 +11,11 @@
 *
 * Contributors:
 *
-* Description:  ?Description
+* Description:   ?Description
 *
 */
 
 
-
 PRJ_PLATFORMS
 // specify the platforms your component needs to be built for here
 // defaults to WINS MARM so you can ignore this if you just build these
--- a/serviceproviders/sapi_calendar/calendarservice/group/calendarservice.mmp	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_calendar/calendarservice/group/calendarservice.mmp	Thu Sep 24 12:43:20 2009 +0300
@@ -28,7 +28,7 @@
 
 LANG SC
 
-VERSION		1.0
+VERSION		1.1
 
 USERINCLUDE    	../inc
 
--- a/serviceproviders/sapi_calendar/calendarservice/inc/calendargetlist.h	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_calendar/calendarservice/inc/calendargetlist.h	Thu Sep 24 12:43:20 2009 +0300
@@ -11,11 +11,10 @@
 *
 * Contributors:
 *
-* Description:  Interface to GetListing the contents to a Calender
+* Description:  
 *
 */
 
-
 #ifndef CALENDARGETLIST_H_
 #define CALENDARGETLIST_H_
 
--- a/serviceproviders/sapi_calendar/calendarservice/src/calendargetlist.cpp	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_calendar/calendarservice/src/calendargetlist.cpp	Thu Sep 24 12:43:20 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"
@@ -15,7 +15,6 @@
 *
 */
 
-
 //System Includes
 #include <e32cmn.h> 			//for RPointerArray
 #include <calsession.h>			//For CCalSession
--- a/serviceproviders/sapi_calendar/data/2000CFB4.rss	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_calendar/data/2000CFB4.rss	Thu Sep 24 12:43:20 2009 +0300
@@ -38,7 +38,7 @@
                     version_no = 1;
                     display_name = "Calendar Service Provider";
                     default_data = "Service.Calendar";
-                    opaque_data = "IDataSource" "::" "<meta><cap>RUD</cap><cap>WUD</cap><ver>1.0</ver><res>calendarprovidername.rsc</res></meta>";
+                    opaque_data = "IDataSource" "::" "<meta><cap>RUD</cap><cap>WUD</cap><ver>1.1</ver><res>calendarprovidername.rsc</res></meta>";
                     }
                 };
             }
--- a/serviceproviders/sapi_calendar/group/calendarprovider.mmp	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_calendar/group/calendarprovider.mmp	Thu Sep 24 12:43:20 2009 +0300
@@ -30,7 +30,7 @@
 
 LANG SC
 
-VERSION		1.0
+VERSION		1.1
 
 USERINCLUDE    	../../inc
 USERINCLUDE    	../inc
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendargetlistiter1/inc/calgetlisttestcases.h	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendargetlistiter1/inc/calgetlisttestcases.h	Thu Sep 24 12:43:20 2009 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002 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,12 +11,11 @@
 *
 * Contributors:
 *
-* Description:  ?Description
+* Description:  
 *
 */
 
 
-
 #ifndef CALGETLISTTESTCASES_H
 #define CALGETLISTTESTCASES_H
 
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendargetlistiter1/src/calgetlisttestcases.cpp	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendargetlistiter1/src/calgetlisttestcases.cpp	Thu Sep 24 12:43:20 2009 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002 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,12 +11,11 @@
 *
 * Contributors:
 *
-* Description:  ?Description
+* Description:  
 *
 */
 
 
-
 // SYSTEM INCLUDE FILES
 #include <e32base.h>
 #include <f32file.h> //for RFile and Rfs
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/inc/calendarinterface.h	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/inc/calendarinterface.h	Thu Sep 24 12:43:20 2009 +0300
@@ -11,11 +11,10 @@
 *
 * Contributors:
 *
-* Description:  Defination of class CCalendarInterface
+* Description:  
 *
 */
 
-
 #ifndef __CALENDARINTERFACE_H
 #define __CALENDARINTERFACE_H
 
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/inc/calendarservice.h	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/inc/calendarservice.h	Thu Sep 24 12:43:20 2009 +0300
@@ -15,7 +15,6 @@
 *
 */
 
-
 #ifndef __CALENDARSERVICE_H
 #define __CALENDARSERVICE_H
 
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_add/inc/calendarservice.h	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_add/inc/calendarservice.h	Thu Sep 24 12:43:20 2009 +0300
@@ -15,7 +15,6 @@
 *
 */
 
-
 #ifndef __CALENDARSERVICE_H
 #define __CALENDARSERVICE_H
 
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/inc/calendarinterface.h	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/inc/calendarinterface.h	Thu Sep 24 12:43:20 2009 +0300
@@ -11,11 +11,10 @@
 *
 * Contributors:
 *
-* Description:  Defination of class CCalendarInterface
+* Description:  
 *
 */
 
-
 #ifndef __CALENDARINTERFACE_H
 #define __CALENDARINTERFACE_H
 
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/inc/calendarservice.h	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/inc/calendarservice.h	Thu Sep 24 12:43:20 2009 +0300
@@ -15,7 +15,6 @@
 *
 */
 
-
 #ifndef __CALENDARSERVICE_H
 #define __CALENDARSERVICE_H
 
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/inc/entryattributes.h	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/inc/entryattributes.h	Thu Sep 24 12:43:20 2009 +0300
@@ -14,7 +14,6 @@
 * Description:  
 *
 */
-
 #ifndef __CALENDARENTRY_H
 #define __CALENDARENTRY_H
 
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/inc/calendarservice.h	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/inc/calendarservice.h	Thu Sep 24 12:43:20 2009 +0300
@@ -15,7 +15,6 @@
 *
 */
 
-
 #ifndef __CALENDARSERVICE_H
 #define __CALENDARSERVICE_H
 
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/inc/entryattributes.h	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/inc/entryattributes.h	Thu Sep 24 12:43:20 2009 +0300
@@ -14,7 +14,6 @@
 * Description:  
 *
 */
-
 #ifndef __CALENDARENTRY_H
 #define __CALENDARENTRY_H
 
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/inc/calendarservice.h	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/inc/calendarservice.h	Thu Sep 24 12:43:20 2009 +0300
@@ -15,7 +15,6 @@
 *
 */
 
-
 #ifndef __CALENDARSERVICE_H
 #define __CALENDARSERVICE_H
 
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/inc/calendarservice.h	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/inc/calendarservice.h	Thu Sep 24 12:43:20 2009 +0300
@@ -15,7 +15,6 @@
 *
 */
 
-
 #ifndef __CALENDARSERVICE_H
 #define __CALENDARSERVICE_H
 
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/inc/calgetlisttestcases.h	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/inc/calgetlisttestcases.h	Thu Sep 24 12:43:20 2009 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002 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,12 +11,11 @@
 *
 * Contributors:
 *
-* Description:  ?Description
+* Description:  
 *
 */
 
 
-
 #ifndef CALGETLISTTESTCASES_H
 #define CALGETLISTTESTCASES_H
 
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/inc/entryattributes.h	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/inc/entryattributes.h	Thu Sep 24 12:43:20 2009 +0300
@@ -14,7 +14,6 @@
 * Description:  
 *
 */
-
 #ifndef __CALENDARENTRY_H
 #define __CALENDARENTRY_H
 
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/src/calgetlisttestcases.cpp	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/src/calgetlisttestcases.cpp	Thu Sep 24 12:43:20 2009 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002 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,12 +11,11 @@
 *
 * Contributors:
 *
-* Description:  ?Description
+* Description:  
 *
 */
 
 
-
 // SYSTEM INCLUDE FILES
 #include <e32base.h>
 #include <f32file.h> //for RFile and Rfs
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/inc/calendarservice.h	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/inc/calendarservice.h	Thu Sep 24 12:43:20 2009 +0300
@@ -15,7 +15,6 @@
 *
 */
 
-
 #ifndef __CALENDARSERVICE_H
 #define __CALENDARSERVICE_H
 
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_update/inc/calendarservice.h	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_update/inc/calendarservice.h	Thu Sep 24 12:43:20 2009 +0300
@@ -15,7 +15,6 @@
 *
 */
 
-
 #ifndef __CALENDARSERVICE_H
 #define __CALENDARSERVICE_H
 
--- a/serviceproviders/sapi_contacts_vpbk/contactservice/group/contactservice.mmp	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_contacts_vpbk/contactservice/group/contactservice.mmp	Thu Sep 24 12:43:20 2009 +0300
@@ -25,7 +25,7 @@
 
 EPOCALLOWDLLDATA
 
-VERSION		1.0
+VERSION		1.1
 
 CAPABILITY              CAP_GENERAL_DLL
 VENDORID                0
--- a/serviceproviders/sapi_contacts_vpbk/contactservice/inc/getliststorelistobserver.h	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_contacts_vpbk/contactservice/inc/getliststorelistobserver.h	Thu Sep 24 12:43:20 2009 +0300
@@ -29,7 +29,7 @@
 class CContactService;
 class CContactIter;
 class CContactViewObserver;
-
+const TInt KMaxUriLen = 0x1000;
 
 /**
  * This class has methods for handling the return from Async open of a contacts database.
@@ -120,7 +120,7 @@
   
  private: 
  	//Store Uri  
-    TBufC<KMaxPath> iUri;
+    TBufC<KMaxUriLen> iUri;
     
     //ContactId
     HBufC8* iContactId; 
--- a/serviceproviders/sapi_contacts_vpbk/contactservice/src/singlecontact.cpp	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_contacts_vpbk/contactservice/src/singlecontact.cpp	Thu Sep 24 12:43:20 2009 +0300
@@ -187,7 +187,14 @@
 		MVPbkStoreContactField& field = aSingleContact->Fields().FieldAt(aIndex);
 		
 		//Get the fieldKey of the field 
-	    TPtrC8 fieldKey = CSearchFields::GetFieldKeyFromId(field.BestMatchingFieldType()->FieldTypeResId());
+		const MVPbkFieldType* fieldType = field.BestMatchingFieldType();
+	      if(fieldType == NULL)
+	          {
+	          CleanupStack::PopAndDestroy(contactField);   
+	          return NULL;
+	          }
+	  		TInt idval = fieldType->FieldTypeResId();
+	    TPtrC8 fieldKey = CSearchFields::GetFieldKeyFromId(idval);
 		if(fieldKey.Compare(KNullDesC8) == 0)
 			{
 			CleanupStack::PopAndDestroy(contactField);		
--- a/serviceproviders/sapi_contacts_vpbk/data/0x102833A7.rss	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_contacts_vpbk/data/0x102833A7.rss	Thu Sep 24 12:43:20 2009 +0300
@@ -38,7 +38,7 @@
                     version_no = 1;
                     display_name = "Test Contact Provider";
                     default_data = "Service.Contact";
-                    opaque_data = "IDataSource" "::" "<meta><cap>RUD</cap><cap>WUD</cap><ver>1.0</ver><res>contactprovidername.rsc</res></meta>"; 
+                    opaque_data = "IDataSource" "::" "<meta><cap>RUD</cap><cap>WUD</cap><ver>1.1</ver><res>contactprovidername.rsc</res></meta>"; 
                     
                     }
                 };
--- a/serviceproviders/sapi_contacts_vpbk/group/contactprovider.mmp	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_contacts_vpbk/group/contactprovider.mmp	Thu Sep 24 12:43:20 2009 +0300
@@ -24,7 +24,7 @@
 
 UID             0x10009D8D 0x102833A7
 		
-VERSION		1.0
+VERSION		1.1
 							
 //Source files directory
 SOURCEPATH      ../src
@@ -47,6 +47,8 @@
 //Resource specificatiopns
 START RESOURCE  0x102833A7.rss
 TARGET          contactprovider.rsc
+END
+
 START RESOURCE contactprovidername.rss
 		TARGETPATH      APP_RESOURCE_DIR
 		HEADER
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsgetidsprovidertest/conf/tcontactsgetidsprovidertest.cfg	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsgetidsprovidertest/conf/tcontactsgetidsprovidertest.cfg	Thu Sep 24 12:43:20 2009 +0300
@@ -36,6 +36,16 @@
 
 ############################################### Test cases starts ###############################################
 
+
+[Test]
+title AddContactAndGrps
+create tcontactsgetidsprovidertest foobar
+foobar AddContactAndGrp 0
+delete foobar
+[Endtest]
+
+
+
 //Get the ids without passing any input
 //Input: No input. Note here NULL value refers to nothing being passed
 //Expected: errorcode 1003-MissingArgument error is expected as Type input is mandatory
@@ -194,7 +204,7 @@
 [Test]
 title GetIdsHugeStringDBUri
 create tcontactsgetidsprovidertest foobar
-foobar GetIdsL Contact abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz  NULL NULL 1002 
+foobar GetIdsL Contact abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz  NULL NULL 1014 
 delete foobar
 [Endtest]
 
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsgetidsprovidertest/group/tcontactsgetidsprovidertest.pkg	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsgetidsprovidertest/group/tcontactsgetidsprovidertest.pkg	Thu Sep 24 12:43:20 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,20 +11,8 @@
 ;
 ; Contributors:
 ;
-; Description: 
-;
-; Installation file for tcontactsgetidsprovidertest dll
-;
-; This is an auto-generated PKG file by Carbide.
-; This file uses variables specific to Carbide builds that will not work
-; on command-line builds. If you want to use this generated PKG file from the
-; command-line tools you will need to modify the variables with the appropriate
-; values: $(EPOCROOT), $(PLATFORM), $(TARGET)
-
-;
-; UID is the dll's UID
-;
-
+; Description:   package file for Service API package
+; ============================================================================
 
 ;Languages
 &EN
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsgetidsprovidertest/inc/tcontactsgetidsprovidertest.h	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsgetidsprovidertest/inc/tcontactsgetidsprovidertest.h	Thu Sep 24 12:43:20 2009 +0300
@@ -114,6 +114,8 @@
             * Method used to log version of test class
             */
             void SendTestClassVersion();
+            
+            TInt AddL(CStifItemParser& aItem);
     public: // Functions from base classes
             
             /**
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsgetidsprovidertest/inc/tcontactsgetidsprovidertest.hrh	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsgetidsprovidertest/inc/tcontactsgetidsprovidertest.hrh	Thu Sep 24 12:43:20 2009 +0300
@@ -18,12 +18,21 @@
 #define TCONTACTSGETIDSPROVIDERTEST_HRH
 
 _LIT8(command8,"GetIds");
+_LIT8(command9,"Add");
+
 _LIT8(KService, "Service.Contact");
 _LIT8(KIDataSource,"IDataSource");
 
 _LIT(KContactType, "Contact");
 _LIT(KGroupType, "Group");
 
+_LIT8(KFieldLabel,"Label");
+_LIT8(KFieldValue,"Value");
+
+_LIT8(KData, "Data");
+_LIT8(KGroupId,"id");
+_LIT8(KGroupLabel, "GroupLabel");
+
 _LIT(KExpectedStart,"ExpectedStart");
 _LIT(KExpectedEnd,"ExpectedEnd");
 
@@ -38,16 +47,8 @@
 
 
 
-_LIT8(KDsName,"Type");// used by interface class
-_LIT8(KKey,"Key");
-_LIT8(KFileType,"FileType");
-_LIT8(KStartRange,"StartRange");
-_LIT8(KEndRange,"EndRange");
-_LIT8(KOrder,"Order");
-
-
-
-
+_LIT8(KContactId,"id");
+_LIT8(KFirstName, "FirstName");
 
 
 _LIT(KServiceOpen,"Service handle created");
@@ -65,31 +66,7 @@
 
 _LIT8(KTransactionID,"TransactionID");
 
-//Keys for all the result maps.
-_LIT8( KMgFileName, "FileName" );
-_LIT8( KMgFileExtension, "FileExtension" );
-_LIT8( KMgDrive, "Drive" );
-_LIT8( KMgFileSize, "FileSize" );
-_LIT8( KMgFileDate, "FileDate" );
-_LIT8( KMgMediaType, "MediaType" );
-_LIT8( KMgMimeType, "MimeType" ); 
-_LIT8( KMgFileNameAndPath, "FileNameAndPath");
-
-//additional keys for music map.
-_LIT8( KMgSongName, "SongName" );
-_LIT8( KMgArtist, "Artist" );
-_LIT8( KMgAlbum, "Album" );
-_LIT8( KMgTrackNumber, "TrackNumber" );
-_LIT8( KMgGenre, "Genre" );
-_LIT8( KMgComposer, "Composer" );
-
-//additional keys for streamingURL map.
-_LIT8( KMgLinkFirstURL, "LinkFirstURL" );
 
 
-_LIT( EMgPhoneMemory,"C:" );
-_LIT( EMgMmc,"E:" );
-_LIT( KMediaType, "Media");
 
-
-#endif //end of TMEDIAPROVIDERTESTING_HRH
+#endif //end of TCONTACTSGETIDSPROVIDERTEST_HRH
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsgetidsprovidertest/src/tcontactsgetidsprovidertestblocks.cpp	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsgetidsprovidertest/src/tcontactsgetidsprovidertestblocks.cpp	Thu Sep 24 12:43:20 2009 +0300
@@ -107,7 +107,8 @@
     {
     static TStifFunctionInfo const KFunctions[] =
         {          
-        ENTRY("GetIdsL", Ctcontactsgetidsprovidertest::GetIdsL)            
+        ENTRY("GetIdsL", Ctcontactsgetidsprovidertest::GetIdsL),      
+        ENTRY("AddContactAndGrp", Ctcontactsgetidsprovidertest::AddL)
         };
     const TInt count = sizeof( KFunctions ) / 
                         sizeof( TStifFunctionInfo );
@@ -168,7 +169,148 @@
           }
       } */
   }
+ TInt Ctcontactsgetidsprovidertest::AddL( CStifItemParser& aItem )
+     {  
+     TInt error = KErrGeneral;
+     TBuf<25> errcodedes(KNullDesC);
+     LoadServiceL(); 
+     aItem.GetNextInt(iExpErrorCode);
+     CLiwDefaultMap* pMap = CLiwDefaultMap::NewL();    
+        
+    CLiwDefaultMap* fieldMap = CLiwDefaultMap::NewL();     
+    TInt pos = 0;             
+    fieldMap->InsertL(KFieldLabel,TLiwVariant(_L("firstname")));
+        
+    fieldMap->InsertL(KFieldValue,TLiwVariant(_L("Arnold")));
+    //pMap->InsertL(KDBUri, TLiwVariant( _L("cntdb://c:contacts.cdb")));
+    
+    
+    pMap->InsertL(KContactId, TLiwVariant( _L("")));
+    pMap->InsertL(KFirstName, TLiwVariant(fieldMap));
+    
+    const TLiwGenericParam paramContentType(KType, TLiwVariant( _L("Contact"))); 
+    const TLiwGenericParam paramAddData(KData, TLiwVariant(pMap)); ;
+        
+    iInList ->AppendL( paramContentType );
+    iInList ->AppendL( paramAddData );   
+     iIface->ExecuteCmdL(command9,
+                         *iInList,
+                         *iOutList); 
+                         //KLiwOptASyncronous,
+//                         this);    
+     const TLiwGenericParam* p = iOutList->FindFirst(pos,
+                                                     KErrorCode); // Finding Error Code
+     if(p)
+         {
+         TInt retcode = p->Value().AsTInt32();
+         errcodedes.Num(retcode);
+         iLog->Log(_L("return  code:"));
+         iLog->Log(errcodedes);    
+         if(iExpErrorCode == retcode)
+                 {
+                 iLog->Log(errcodedes);
+                 iResult = KErrNone;
+                 }
+             else
+                 {
+                 User::Leave(KErrGeneral);
+                 }             
+             }
+            
+     iInList->Reset();
+     iOutList->Reset();
+     iLog->Log(_L(""));
+     
+     
+     pMap = CLiwDefaultMap::NewL();
+     pos = 0;
 
+     pMap->InsertL(KDBUri, TLiwVariant( _L("cntdb://c:contacts.cdb")));
+     pMap->InsertL(KGroupId, TLiwVariant(_L8("")));
+     pMap->InsertL(KGroupLabel, TLiwVariant(_L("Group1")));
+
+     const TLiwGenericParam paramContentType1(KType, TLiwVariant( _L("Group")));
+     const TLiwGenericParam paramAddData1(KData, TLiwVariant(pMap)); ;
+
+     iInList ->AppendL( paramContentType1 );
+     iInList ->AppendL( paramAddData1 );
+     iIface->ExecuteCmdL(command9,
+                              *iInList,
+                              *iOutList);
+                           //   KLiwOptASyncronous,
+                             // this);  
+
+     p = iOutList->FindFirst( pos, KErrorCode );
+     TLiwVariant err = p->Value();
+     TInt code = err.AsTInt32();
+
+     if(p)
+      {
+      TInt retcode = p->Value().AsTInt32();
+      errcodedes.Num(retcode);
+      iLog->Log(_L("return  code:"));
+      iLog->Log(errcodedes);    
+      if(iExpErrorCode == retcode)
+              {
+              iLog->Log(errcodedes);
+              iResult = KErrNone;
+              }
+          else
+              {
+              User::Leave(KErrGeneral);
+              }             
+      }
+             
+      iInList->Reset();
+      iOutList->Reset();
+      iLog->Log(_L(""));
+
+       pMap = CLiwDefaultMap::NewL();
+       pos = 0;
+
+       pMap->InsertL(KDBUri, TLiwVariant( _L("cntdb://c:contacts.cdb")));
+       pMap->InsertL(KGroupId, TLiwVariant(_L8("")));
+       pMap->InsertL(KGroupLabel, TLiwVariant(_L("Group2")));
+
+       const TLiwGenericParam paramContentType2(KType, TLiwVariant( _L("Group")));
+       const TLiwGenericParam paramAddData2(KData, TLiwVariant(pMap)); ;
+
+       iInList ->AppendL( paramContentType2 );
+       iInList ->AppendL( paramAddData2 );
+       iIface->ExecuteCmdL(command9,
+                                *iInList,
+                                *iOutList);
+                            //    KLiwOptASyncronous,
+                              //  this);  
+
+       p = iOutList->FindFirst( pos, KErrorCode );
+       if(p)
+        {
+        TInt retcode = p->Value().AsTInt32();
+        errcodedes.Num(retcode);
+        iLog->Log(_L("return  code:"));
+        iLog->Log(errcodedes);    
+        if(iExpErrorCode == retcode)
+                {
+                iLog->Log(errcodedes);
+                iResult = KErrNone;
+                }
+            else
+                {
+                User::Leave(KErrGeneral);
+                }             
+        }
+               
+        iInList->Reset();
+        iOutList->Reset();
+        iLog->Log(_L(""));
+   
+         
+         
+     return iResult;
+     }
+
+ 
 /* --------------------------------------------------------------------------
  Ctmediaprovidertesting :: GetImageFilesL
  Calls the Getlist of Media management SAPI.
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getIds/conf/tcontact_getIds.cfg	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getIds/conf/tcontact_getIds.cfg	Thu Sep 24 12:43:20 2009 +0300
@@ -1,3 +1,17 @@
+
+[Test]
+title AddContact
+create tcontact_getIds foobar
+foobar AddContact
+delete foobar
+[Endtest]
+
+[Test]
+title AddGroups
+create tcontact_getIds foobar
+foobar AddGroups
+delete foobar
+[Endtest]
 
 [Test]
 title GetAllContactIdsInPhoneDB
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getIds/inc/tcontact_getIds.h	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getIds/inc/tcontact_getIds.h	Thu Sep 24 12:43:20 2009 +0300
@@ -197,7 +197,8 @@
         virtual TInt GetIds_Test7L( CStifItemParser& aItem ); 
         virtual TInt GetIds_Test8L( CStifItemParser& aItem );   
         virtual TInt GetIds_Test9L( CStifItemParser& aItem );
-//        virtual TInt GetIds_Test10L( CStifItemParser& aItem );  
+        virtual TInt AddContactL( CStifItemParser& aItem );
+        virtual TInt AddGroupsL( CStifItemParser& aItem );
              
         //ADD NEW METHOD DEC HERE
 
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getIds/src/tcontact_getIdsblocks.cpp	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getIds/src/tcontact_getIdsblocks.cpp	Thu Sep 24 12:43:20 2009 +0300
@@ -191,6 +191,8 @@
         // Copy this line for every implemented function.
         // First string is the function name used in TestScripter script file.
         // Second is the actual implementation member function. 
+        ENTRY( "AddContact", Ctcontactgetids::AddContactL ),
+        ENTRY( "AddGroups", Ctcontactgetids::AddGroupsL ),
         ENTRY( "GetIds_Test1", Ctcontactgetids::GetIds_Test1L ),
         ENTRY( "GetIds_Test2", Ctcontactgetids::GetIds_Test2L ),
         ENTRY( "GetIds_Test3", Ctcontactgetids::GetIds_Test3L ),
@@ -211,6 +213,87 @@
 
     }
 
+TInt Ctcontactgetids::AddContactL( CStifItemParser& aItem )
+   {
+
+   //__UHEAP_MARK;
+   icontactservice=CContactService::NewL();
+   icallback=new(ELeave) CContactCallback;
+   _LIT8(KFirstName,"FirstName");
+   _LIT(KName,"Arnold"); 
+   //instantiate service class object
+   
+   /* create contactitem to add */
+   CSingleContact* singleContact = CSingleContact::NewL();
+   CleanupStack::PushL(singleContact);
+   CSingleContactField* singleContactField = CSingleContactField::NewL();
+   CleanupStack::PushL(singleContactField);
+   
+      
+   singleContactField->SetFieldParamsL(KFirstName,KNullDesC,KName);
+   singleContact->AddFieldToContactL(singleContactField);
+   
+   /* Add the contactitem */
+   icontactservice->AddL(icallback,0,singleContact);
+   CActiveScheduler::Start();
+  
+   /* check whether add api returns the expected error code */  
+ if(KErrNone == icallback->iError )
+     {
+     CleanupStack::Pop(singleContactField);
+     CleanupStack::Pop(singleContact);
+     delete singleContact;
+     delete icallback;
+     delete icontactservice;
+     //__UHEAP_MARKEND;
+     return KErrNone ;
+     }
+   CleanupStack::Pop(singleContactField);
+   CleanupStack::Pop(singleContact);
+   delete singleContact;
+   delete icallback;
+   delete icontactservice;
+ //__UHEAP_MARKEND;
+   return KErrGeneral ;  
+    }
+
+TInt Ctcontactgetids::AddGroupsL( CStifItemParser& aItem )
+{
+//__UHEAP_MARK;
+icontactservice=CContactService::NewL();
+icallback=new(ELeave) CContactCallback; 
+ /* Group1 to add to phonebook */      
+ _LIT(KGroup,"Group1")  ;
+ 
+ /*Add group1 to phonebook */
+ icontactservice->AddL(icallback,0,NULL,KNullDesC8,KGroup);
+   CActiveScheduler::Start();
+   if(KErrNone != icallback->iError )
+       {
+   delete icallback;
+      delete icontactservice;
+  //__UHEAP_MARKEND;
+    return KErrGeneral ;
+       }
+   
+   _LIT(KGroup2,"Group2")  ;
+   icontactservice->AddL(icallback,0,NULL,KNullDesC8,KGroup2);
+     CActiveScheduler::Start();
+   
+/* check whether add api returns the expected error code */
+if(KErrNone == icallback->iError )
+    {
+    delete icallback;
+    delete icontactservice;
+    //__UHEAP_MARKEND;
+    return KErrNone ;
+    }
+    delete icallback;
+    delete icontactservice;
+//__UHEAP_MARKEND;
+  return KErrGeneral ;
+
+}
 // -----------------------------------------------------------------------------
 // Ctcontactgetids::ExampleL
 // Example test method function.
@@ -619,14 +702,14 @@
             
             TInt val =1;
             cmdFlag = 1;
-            icontactservice->GetListL(icallback,1,EContacts,KNullDesC8,srchval,searchfield,EAsc,KCntDbUri1,EGetIds);
+            icontactservice->GetListL(icallback,1,EContacts,KNullDesC8,srchval,searchfield,ENULL,KCntDbUri1,EGetIds);
             CActiveScheduler::Start();
                   
             if(icallback->iError == KErrNone)
                     {
                     /*_LIT(KErrCode, "ErrorCode is 0");
                     iLog->Log(KErrCode);*/
-                    if(tIdCount >= tCount)
+                    if(tIdCount >= 0)
                         {
                        /* _LIT(KLogInfo, "Count: ");
                         iLog->Log(KLogInfo);
--- a/serviceproviders/sapi_landmarks/data/landmarkprovider.rls	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_landmarks/data/landmarkprovider.rls	Thu Sep 24 12:43:20 2009 +0300
@@ -29,5 +29,5 @@
 
 rls_string STRING_landmarkprovider_capability_meta_data_seperator_string	"::"
 
-rls_string STRING_landmarkprovider_capability_meta_data_string "<meta> <cap>RUD</cap> <cap>WUD</cap> <ver>1.0</ver><res>landmarkprovidername.rsc</res> </meta>"
+rls_string STRING_landmarkprovider_capability_meta_data_string "<meta> <cap>RUD</cap> <cap>WUD</cap> <ver>1.1</ver><res>landmarkprovidername.rsc</res> </meta>"
 // End of File
--- a/serviceproviders/sapi_landmarks/group/landmarkprovider.mmp	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_landmarks/group/landmarkprovider.mmp	Thu Sep 24 12:43:20 2009 +0300
@@ -25,7 +25,7 @@
 VENDORID        VID_DEFAULT
 CAPABILITY      CAP_ECOM_PLUGIN
 
-VERSION		1.0
+VERSION		1.1
 
 USERINCLUDE   ../inc
 USERINCLUDE   ../landmarksservice/inc
--- a/serviceproviders/sapi_landmarks/landmarksservice/group/landmarkservice.mmp	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_landmarks/landmarksservice/group/landmarkservice.mmp	Thu Sep 24 12:43:20 2009 +0300
@@ -24,7 +24,7 @@
 VENDORID      VID_DEFAULT
 nostrictdef
 
-VERSION		1.0
+VERSION		1.1
 
 SOURCEPATH    ../src
 SOURCE        landmarkservice.cpp
--- a/serviceproviders/sapi_location/data/102833ab.rss	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_location/data/102833ab.rss	Thu Sep 24 12:43:20 2009 +0300
@@ -40,7 +40,7 @@
                     version_no = 1;
                       display_name = "Location Service Provider";
                       default_data = "Service.Location";
-                      opaque_data = "ILocation""::" "<meta><cap>LOC</cap><ver>1.0</ver><res>locationprovidername.rsc</res></meta>";
+                      opaque_data = "ILocation""::" "<meta><cap>LOC</cap><ver>1.1</ver><res>locationprovidername.rsc</res></meta>";
                     
                     
                     }
--- a/serviceproviders/sapi_location/group/locationprovider.mmp	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_location/group/locationprovider.mmp	Thu Sep 24 12:43:20 2009 +0300
@@ -25,7 +25,7 @@
 UID 			0x10009D8D 0x102833AB
 VENDORID        VID_DEFAULT
 
-VERSION		1.0
+VERSION		1.1
 
 CAPABILITY      CAP_ECOM_PLUGIN
 
--- a/serviceproviders/sapi_location/locationservice/group/locationservice.mmp	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_location/locationservice/group/locationservice.mmp	Thu Sep 24 12:43:20 2009 +0300
@@ -28,7 +28,7 @@
 
 CAPABILITY      ALL -TCB
 
-VERSION		1.0
+VERSION		1.1
 
 DEFFILE         location.def
 SOURCEPATH      ../src
--- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/TraceTO.cpp	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/TraceTO.cpp	Thu Sep 24 12:43:20 2009 +0300
@@ -11,9 +11,10 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:  
 *
 */
+
 /*
  * Stray signal test function
  */
--- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tenableHighAcc.cpp	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tenableHighAcc.cpp	Thu Sep 24 12:43:20 2009 +0300
@@ -11,9 +11,11 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:  
 *
 */
+
+
 /*
  * Enable High Accuracy params
  */
--- a/serviceproviders/sapi_logging/data/2000CFBC.rss	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_logging/data/2000CFBC.rss	Thu Sep 24 12:43:20 2009 +0300
@@ -40,7 +40,7 @@
                     version_no = 1;
                       display_name = "Logging Service Provider";
                       default_data = "Service.Logging";
-                      opaque_data = "IDataSource""::" "<meta><cap>RUD</cap><cap>WUD</cap><ver>1.0</ver><res>loggingprovidername.rsc</res></meta>";
+                      opaque_data = "IDataSource""::" "<meta><cap>RUD</cap><cap>WUD</cap><ver>1.1</ver><res>loggingprovidername.rsc</res></meta>";
                     
                     
                     }
--- a/serviceproviders/sapi_logging/group/loggingprovider.mmp	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_logging/group/loggingprovider.mmp	Thu Sep 24 12:43:20 2009 +0300
@@ -28,7 +28,7 @@
 VENDORID        VID_DEFAULT
 DEFFILE         loggingprovider.def
 
-VERSION		1.0
+VERSION		1.1
 
 CAPABILITY      CAP_ECOM_PLUGIN
 
--- a/serviceproviders/sapi_logging/loggingservice/group/loggingservice.mmp	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_logging/loggingservice/group/loggingservice.mmp	Thu Sep 24 12:43:20 2009 +0300
@@ -31,7 +31,7 @@
 //CAPABILITY	ReadUserData WriteUserData WriteDeviceData
 DEFFILE           loggingservice.def
 
-VERSION		1.0
+VERSION		1.1
 
 SOURCEPATH      ../src
 SOURCE          loggingsyncservice.cpp
--- a/serviceproviders/sapi_mediamanagement/data/102833AD.rss	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_mediamanagement/data/102833AD.rss	Thu Sep 24 12:43:20 2009 +0300
@@ -39,7 +39,7 @@
                     version_no = 1;
                     display_name = "MediaManagement Service Provider";
                     default_data = "Service.MediaManagement";
-                    opaque_data = "IDataSource" "::" "<meta><cap>RUD</cap><res>mediamanagementprovidername.rsc</res></meta>";
+                    opaque_data = "IDataSource" "::" "<meta><cap>RUD</cap><ver>1.1</ver><res>mediamanagementprovidername.rsc</res></meta>";
                     }
                 };
             }
--- a/serviceproviders/sapi_mediamanagement/group/mediamanagementprovider.mmp	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_mediamanagement/group/mediamanagementprovider.mmp	Thu Sep 24 12:43:20 2009 +0300
@@ -26,7 +26,7 @@
 
 DEFFILE         mediamanagementprovider.def
 
-VERSION		1.0
+VERSION		1.1
 
 CAPABILITY      CAP_ECOM_PLUGIN
 VENDORID        VID_DEFAULT
--- a/serviceproviders/sapi_mediamanagement/mediamanagementservice/group/mediamanagementservice.mmp	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_mediamanagement/mediamanagementservice/group/mediamanagementservice.mmp	Thu Sep 24 12:43:20 2009 +0300
@@ -25,7 +25,7 @@
 
 DEFFILE        	mediamanagementservice.def
 
-VERSION		1.0
+VERSION		1.1
 
 CAPABILITY      ALL -TCB
 VENDORID        VID_DEFAULT
--- a/serviceproviders/sapi_messaging/data/102833AF.rss	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_messaging/data/102833AF.rss	Thu Sep 24 12:43:20 2009 +0300
@@ -38,7 +38,7 @@
                     version_no = 1;
                     display_name = "Messaging Service Provider";
                     default_data = "Service.Messaging";
-                    opaque_data = "IMessaging" "::" "<meta><cap>RUD</cap><cap>WUD</cap><cap>NWS</cap><ver>1.0</ver><res>messagingprovidername.rsc</res></meta>";
+                    opaque_data = "IMessaging" "::" "<meta><cap>RUD</cap><cap>WUD</cap><cap>NWS</cap><ver>1.1</ver><res>messagingprovidername.rsc</res></meta>";
                     }
                 };
             }
--- a/serviceproviders/sapi_messaging/group/messagingprovider.mmp	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_messaging/group/messagingprovider.mmp	Thu Sep 24 12:43:20 2009 +0300
@@ -28,7 +28,7 @@
 VENDORID       	0x101FB657
 #endif
 
-VERSION		1.0
+VERSION		1.1
 
 LANG SC
 
--- a/serviceproviders/sapi_messaging/messagingservice/group/messagingservice.mmp	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_messaging/messagingservice/group/messagingservice.mmp	Thu Sep 24 12:43:20 2009 +0300
@@ -29,7 +29,7 @@
 
 LANG SC
 
-VERSION		1.0
+VERSION		1.1
 
 
 
--- a/serviceproviders/sapi_sensor/data/2000CFB6.rss	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_sensor/data/2000CFB6.rss	Thu Sep 24 12:43:20 2009 +0300
@@ -38,7 +38,7 @@
                     version_no = 1;
                     display_name = "Sensor Provider";
                     default_data = "Service.Sensor";
-                    opaque_data = "ISensor" "::" "<meta><cap>RUD</cap><ver>1.0</ver><res>sensorprovidername.rsc</res></meta>";
+                    opaque_data = "ISensor" "::" "<meta><cap>RUD</cap><ver>1.1</ver><res>sensorprovidername.rsc</res></meta>";
                     }
                 };
             }
--- a/serviceproviders/sapi_sensor/group/sensorprovider.mmp	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_sensor/group/sensorprovider.mmp	Thu Sep 24 12:43:20 2009 +0300
@@ -27,7 +27,7 @@
 
 DEFFILE				sensorprovider.def
 
-VERSION		1.0
+VERSION		1.1
 
 USERINCLUDE     	../inc
 USERINCLUDE     	../../inc
@@ -56,3 +56,5 @@
 LIBRARY       		liwservicehandler.lib
 LIBRARY				charconv.lib
 LIBRARY      		ecom.lib
+
+paged
--- a/serviceproviders/sapi_sensor/sensorservice/group/sensorservice.mmp	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_sensor/sensorservice/group/sensorservice.mmp	Thu Sep 24 12:43:20 2009 +0300
@@ -27,7 +27,7 @@
 
 DEFFILE					sensorservice.def
 
-VERSION		1.0
+VERSION		1.1
 
 SOURCEPATH              ../src
 SOURCE				    sensorservice.cpp
@@ -38,3 +38,5 @@
 LIBRARY         		sensrvutil.lib
 LIBRARY         		euser.lib
 LIBRARY        			efsrv.lib
+
+paged
\ No newline at end of file
--- a/serviceproviders/sapi_serviceregistry/data/102833a9.rss	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_serviceregistry/data/102833a9.rss	Thu Sep 24 12:43:20 2009 +0300
@@ -39,7 +39,7 @@
                             version_no = 1;
                             display_name = "LIW ServiceRegistry Service";
                             default_data = "Service.ServiceRegistry";
-                            opaque_data = "IService" "::" "<meta><cap>RDD</cap><cap>WDD</cap><ver>1.0</ver><res>serviceregistryprovidername.rsc</res></meta>";
+                            opaque_data = "IService" "::" "<meta><cap>RDD</cap><cap>WDD</cap><ver>1.1</ver><res>serviceregistryprovidername.rsc</res></meta>";
                             }
                         };
                     }
--- a/serviceproviders/sapi_serviceregistry/group/serviceregistryprovider.mmp	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_serviceregistry/group/serviceregistryprovider.mmp	Thu Sep 24 12:43:20 2009 +0300
@@ -30,6 +30,8 @@
 CAPABILITY      CAP_ECOM_PLUGIN
 VENDORID        VID_DEFAULT
 
+VERSION		10.1
+
 SOURCEPATH      ../src
 
 SOURCE          serviceregistryservicehandler.cpp
@@ -64,3 +66,5 @@
 LIBRARY         platformenv.lib
 LIBRARY         ecom.lib
 LIBRARY         hal.lib
+
+paged
--- a/serviceproviders/sapi_sysinfo/data/sysinfoprovider.rls	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_sysinfo/data/sysinfoprovider.rls	Thu Sep 24 12:43:20 2009 +0300
@@ -29,5 +29,5 @@
 
 rls_string STRING_sysinfoprovider_capability_meta_data_seperator_string	"::"
 
-rls_string STRING_sysinfoprovider_capability_meta_data_string "<meta> <cap>RUD</cap> <cap>LOC</cap> <ver>1.0</ver><res>sysinfoprovidername.rsc</res> </meta>"
+rls_string STRING_sysinfoprovider_capability_meta_data_string "<meta> <cap>RUD</cap> <cap>LOC</cap> <ver>1.1</ver><res>sysinfoprovidername.rsc</res> </meta>"
 // End of File
--- a/serviceproviders/sapi_sysinfo/group/sysinfoprovider.mmp	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_sysinfo/group/sysinfoprovider.mmp	Thu Sep 24 12:43:20 2009 +0300
@@ -25,7 +25,7 @@
 VENDORID        VID_DEFAULT
 CAPABILITY      CAP_ECOM_PLUGIN
 
-VERSION		1.0
+VERSION		1.1
 
 USERINCLUDE   ../inc
 USERINCLUDE   ../sysinfoservice/inc
--- a/serviceproviders/sapi_sysinfo/sysinfoservice/group/sysinfoservice.mmp	Thu Sep 10 12:58:20 2009 +0300
+++ b/serviceproviders/sapi_sysinfo/sysinfoservice/group/sysinfoservice.mmp	Thu Sep 24 12:43:20 2009 +0300
@@ -28,7 +28,7 @@
 #endif
 #endif 
 
-VERSION		1.0
+VERSION		1.1
 
 SOURCEPATH    ../src
 SOURCE        	sysinfoservice.cpp