# HG changeset patch
# User hgs
# Date 1285563413 -19800
# Node ID c18dbca515d9360edc8098c0320804d32e211bf9
# Parent  130372b4fc89744ca7fe0c6b332566a259d991c5
201037_09

diff -r 130372b4fc89 -r c18dbca515d9 applayerpluginsandutils/bookmarksupport/group/tbookmarkbackup.mmp
--- a/applayerpluginsandutils/bookmarksupport/group/tbookmarkbackup.mmp	Fri Sep 17 17:30:56 2010 +0530
+++ b/applayerpluginsandutils/bookmarksupport/group/tbookmarkbackup.mmp	Mon Sep 27 10:26:53 2010 +0530
@@ -13,6 +13,8 @@
 // Description:
 //
 
+//RTEST
+
 target          tbookmarkbackup.exe
 targettype      exe
 CAPABILITY 	AllFiles ReadUserData WriteUserData
@@ -41,7 +43,7 @@
 SOURCE testabclient.cpp backup.cpp inifile.cpp obsrvr.cpp panic.cpp sessnotf.cpp shrepos.cpp srvrepos.cpp srvres.cpp clientrequest.cpp cachemgr.cpp
 
 LIBRARY	euser.lib bookmarkdb.lib inetprotutil.lib estlib.lib
-LIBRARY	bafl.lib efsrv.lib charconv.lib estor.lib cinidata.lib centralrepository.lib
+LIBRARY	bafl.lib efsrv.lib charconv.lib estor.lib iniparser.lib centralrepository.lib
 
 VENDORID 0x70000001
 
diff -r 130372b4fc89 -r c18dbca515d9 applayerpluginsandutils/bookmarksupport/test/cenrepsrv/cachemgr.h
--- a/applayerpluginsandutils/bookmarksupport/test/cenrepsrv/cachemgr.h	Fri Sep 17 17:30:56 2010 +0530
+++ b/applayerpluginsandutils/bookmarksupport/test/cenrepsrv/cachemgr.h	Mon Sep 27 10:26:53 2010 +0530
@@ -17,7 +17,8 @@
 #define CACHEMGR_H
 
 #include <e32base.h>
-#include <cinidata.h>
+//#include <cinidata.h> //Commented and added the below line as part of TEF2 to TEF3 migration
+#include <iniparser.h>
 #include "log.h"
 #include "panic.h"
 #include "srvdefs.h"
diff -r 130372b4fc89 -r c18dbca515d9 applayerprotocols/wappushsupport/Group/WapPushSupport.iby
--- a/applayerprotocols/wappushsupport/Group/WapPushSupport.iby	Fri Sep 17 17:30:56 2010 +0530
+++ b/applayerprotocols/wappushsupport/Group/WapPushSupport.iby	Mon Sep 27 10:26:53 2010 +0530
@@ -38,6 +38,5 @@
 file=ABI_DIR\BUILD_DIR\XmlElemt.dll				System\Libs\Xmlelemt.dll
 file=ABI_DIR\BUILD_DIR\WbxmlLib.dll				System\Libs\Wbxmllib.dll
 file=ABI_DIR\BUILD_DIR\HTTPResponse.dll				System\Libs\HTTPResponse.dll
-file=ABI_DIR\BUILD_DIR\Xmllib.dll				System\Libs\Xmllib.dll
-
-#endif
\ No newline at end of file
+// file=ABI_DIR\BUILD_DIR\xmllib.dll				System\Libs\xmllib.dll
+#endif
diff -r 130372b4fc89 -r c18dbca515d9 applayerprotocols/wappushsupport/Group/bld.inf
--- a/applayerprotocols/wappushsupport/Group/bld.inf	Fri Sep 17 17:30:56 2010 +0530
+++ b/applayerprotocols/wappushsupport/Group/bld.inf	Mon Sep 27 10:26:53 2010 +0530
@@ -35,7 +35,7 @@
 ../inc/MDataProviderObserver.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(mdataproviderobserver.h)
 ../inc/httpstd.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(httpstd.h)
 ../XmlElement/XMLELEMT.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(xmlelemt.h)
-../XmlLib/XmlLib.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(xmllib.h)
+// ../XmlLib/XmlLib.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(xmllib.h)
 ../inc/WbConverter.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(wbconverter.h)
 ../inc/MWbxmlConverterObserver.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(mwbxmlconverterobserver.h)
 ../HTTPResponse/CHTTPResponse.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(chttpresponse.h)
@@ -63,5 +63,5 @@
 ../mmpfiles/XmlElement.mmp
 ../mmpfiles/WbxmlLib.mmp
 ../mmpfiles/HTTPResponse.mmp
-../mmpfiles/XmlLib.mmp
+// ../mmpfiles/XmlLib.mmp
 PRJ_TESTMMPFILES