# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1286142788 -10800
# Node ID 753e9b859ae7ce10a47932b3fc173f3b223a25ba
# Parent  6482b2868773d5e84b7243c4400462b53fea52a3
Revision: 201037
Kit: 201039

diff -r 6482b2868773 -r 753e9b859ae7 applayerpluginsandutils/bookmarksupport/group/tbookmarkbackup.mmp
--- a/applayerpluginsandutils/bookmarksupport/group/tbookmarkbackup.mmp	Fri Sep 17 08:33:20 2010 +0300
+++ b/applayerpluginsandutils/bookmarksupport/group/tbookmarkbackup.mmp	Mon Oct 04 00:53:08 2010 +0300
@@ -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 6482b2868773 -r 753e9b859ae7 applayerpluginsandutils/bookmarksupport/test/cenrepsrv/cachemgr.h
--- a/applayerpluginsandutils/bookmarksupport/test/cenrepsrv/cachemgr.h	Fri Sep 17 08:33:20 2010 +0300
+++ b/applayerpluginsandutils/bookmarksupport/test/cenrepsrv/cachemgr.h	Mon Oct 04 00:53:08 2010 +0300
@@ -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 6482b2868773 -r 753e9b859ae7 applayerprotocols/wappushsupport/Group/BLD.INF
--- a/applayerprotocols/wappushsupport/Group/BLD.INF	Fri Sep 17 08:33:20 2010 +0300
+++ b/applayerprotocols/wappushsupport/Group/BLD.INF	Mon Oct 04 00:53:08 2010 +0300
@@ -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
diff -r 6482b2868773 -r 753e9b859ae7 applayerprotocols/wappushsupport/Group/WapPushSupport.iby
--- a/applayerprotocols/wappushsupport/Group/WapPushSupport.iby	Fri Sep 17 08:33:20 2010 +0300
+++ b/applayerprotocols/wappushsupport/Group/WapPushSupport.iby	Mon Oct 04 00:53:08 2010 +0300
@@ -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 6482b2868773 -r 753e9b859ae7 httpfilters/group/bld.inf
--- a/httpfilters/group/bld.inf	Fri Sep 17 08:33:20 2010 +0300
+++ b/httpfilters/group/bld.inf	Mon Oct 04 00:53:08 2010 +0300
@@ -21,7 +21,7 @@
 #include "../deflatefilter/group/bld.inf"
 //#include "../httpfilteracceptheader/group/bld.inf"
 #include "../httpfilterauthentication/group/bld.inf"
-#include "../httpfilterconnhandler/group/bld.inf"
+//#include "../httpfilterconnhandler/group/bld.inf"
 #include "../httpfilteriop/group/bld.inf"
 //#include "../httpfilterproxy/group/bld.inf"
 //#include "../uaproffilter/group/bld.inf"
diff -r 6482b2868773 -r 753e9b859ae7 layers.sysdef.xml
--- a/layers.sysdef.xml	Fri Sep 17 08:33:20 2010 +0300
+++ b/layers.sysdef.xml	Mon Oct 04 00:53:08 2010 +0300
@@ -7,6 +7,16 @@
     <layer name="mw_layer">
       <module name="netprotocols">
 	    <unit unitID="netdo.netprotocols" mrp="" bldFile="&layer_real_source_path;/group" name="netprotocols"/>
+	    <unit unitID="netdo.bookmarksupport" mrp="" bldFile="&layer_real_source_path;/applayerpluginsandutils/bookmarksupport/group" name="bookmarksupport"/>
+	    <unit unitID="netdo.httpprotocolplugins" mrp="" bldFile="&layer_real_source_path;/applayerpluginsandutils/httpprotocolplugins/group" name="httpprotocolplugins"/>
+	    <unit unitID="netdo.httptransportplugins" mrp="" bldFile="&layer_real_source_path;/applayerpluginsandutils/httptransportplugins/group" name="httptransportplugins"/>
+	    <unit unitID="netdo.uripermissionservices" mrp="" bldFile="&layer_real_source_path;/applayerpluginsandutils/uripermissionservices/group" name="uripermissionservices"/>
+	    <unit unitID="netdo.ftpengine" mrp="" bldFile="&layer_real_source_path;/applayerprotocols/ftpengine/group" name="ftpengine"/>
+	    <unit unitID="netdo.httpservice" mrp="" bldFile="&layer_real_source_path;/applayerprotocols/httpservice/group" name="httpservice"/>
+	    <unit unitID="netdo.httptransportfw" mrp="" bldFile="&layer_real_source_path;/applayerprotocols/httptransportfw/group" name="httptransportfw"/>
+	    <unit unitID="netdo.telnetengine" mrp="" bldFile="&layer_real_source_path;/applayerprotocols/telnetengine/group" name="telnetengine"/>
+	    <unit unitID="netdo.wapbase" mrp="" bldFile="&layer_real_source_path;/applayerprotocols/wapbase/group" name="wapbase"/>
+	    <unit unitID="netdo.wappushsupport" mrp="" bldFile="&layer_real_source_path;/applayerprotocols/wappushsupport/group" name="wappushsupport"/>
       </module>
     </layer>
   </systemModel>
diff -r 6482b2868773 -r 753e9b859ae7 package_definition.xml
--- a/package_definition.xml	Fri Sep 17 08:33:20 2010 +0300
+++ b/package_definition.xml	Mon Oct 04 00:53:08 2010 +0300
@@ -11,59 +11,47 @@
       <component id="deflatefilter" filter="s60" name="Deflate Filter" class="plugin">
         <unit bldFile="httpfilters/deflatefilter/group"/>
       </component>
-      <component id="httpfilteracceptheader" filter="s60" name="Accept Header Filter" class="plugin">
-        <unit bldFile="httpfilters/httpfilteracceptheader/group"/>
-      </component>
       <component id="httpfilterauthentication" filter="s60" name="Authentication Filter" class="plugin">
         <unit bldFile="httpfilters/httpfilterauthentication/group"/>
       </component>
-      <component id="httpfilterconnhandler" filter="s60" name="Connection Handler Fitler" class="plugin">
-        <unit bldFile="httpfilters/httpfilterconnhandler/group"/>
-      </component>
       <component id="httpfilteriop" filter="s60" name="HTTP IOP Filter" class="plugin">
         <unit bldFile="httpfilters/httpfilteriop/group"/>
       </component>
-      <component id="httpfilterproxy" filter="s60" name="HTTP Proxy Filter" class="plugin">
-        <unit bldFile="httpfilters/httpfilterproxy/group"/>
-      </component>
-      <component id="uaproffilter" filter="s60" name="UAProf Filter" class="plugin">
-        <unit bldFile="httpfilters/uaproffilter/group"/>
-      </component>
     </collection>
     <collection id="applayerprotocols" name="Application Layer Protocols" level="server">
-      <component id="httptransportfw" name="HTTP Transport Framework" introduced="6.2" purpose="optional">
+      <component id="httptransportfw" filter="s60" name="HTTP Transport Framework" introduced="6.2" purpose="optional">
         <unit bldFile="applayerprotocols/httptransportfw/group" mrp="applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
       </component>
-      <component id="httpexamples" name="HTTP Examples" introduced="6.2" purpose="development">
+      <component id="httpexamples" filter="s60" name="HTTP Examples" introduced="6.2" purpose="development" >
         <unit bldFile="applayerprotocols/httpexamples/group" mrp="applayerprotocols/httpexamples/group/http_examples.mrp"/>
       </component>
-      <component id="wappushsupport" name="WAP Push Support" introduced="6.2" purpose="optional">
+      <component id="wappushsupport" filter="s60" name="WAP Push Support" introduced="6.2" purpose="optional">
         <unit bldFile="applayerprotocols/wappushsupport/Group" mrp="applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
       </component>
-      <component id="wapbase" name="WAP Base" introduced="6.0" purpose="optional">
+      <component id="wapbase" filter="s60" name="WAP Base" introduced="6.0" purpose="optional">
         <unit bldFile="applayerprotocols/wapbase/Group" mrp="applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
       </component>
-      <component id="ftpengine" name="FTP Engine" introduced="6.0" purpose="optional">
+      <component id="ftpengine" filter="s60" name="FTP Engine" introduced="6.0" purpose="optional">
         <unit bldFile="applayerprotocols/ftpengine/group" mrp="applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
       </component>
-      <component id="telnetengine" name="Telnet Engine" introduced="6.0" purpose="optional">
+      <component id="telnetengine" filter="s60" name="Telnet Engine" introduced="6.0" purpose="optional">
         <unit bldFile="applayerprotocols/telnetengine/group" mrp="applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
       </component>
-      <component id="httpserviceapi" name="HTTP Service API" introduced="TB9.2" purpose="optional">
+      <component id="httpserviceapi" filter="s60" name="HTTP Service API" introduced="TB9.2" purpose="optional">
         <unit bldFile="applayerprotocols/httpservice/group" mrp="applayerprotocols/httpservice/group/http_service.mrp"/>
       </component>
     </collection>
     <collection id="applayerpluginsandutils" name="Application Layer Plugins and Utils" level="framework">
-      <component id="uripermissionservices" name="URI Permission Services" introduced="^2" purpose="optional">
+      <component id="uripermissionservices" filter="s60" name="URI Permission Services" introduced="^2" purpose="optional">
         <unit bldFile="applayerpluginsandutils/uripermissionservices/group" mrp="applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
       </component>
-      <component id="bookmarksupport" name="Bookmark Support" introduced="9.1" purpose="optional">
+      <component id="bookmarksupport" filter="s60" name="Bookmark Support" introduced="9.1" purpose="optional">
         <unit bldFile="applayerpluginsandutils/bookmarksupport/group" mrp="applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
       </component>
-      <component id="httpprotocolplugins" name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" class="plugin">
+      <component id="httpprotocolplugins" filter="s60" name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" class="plugin">
         <unit bldFile="applayerpluginsandutils/httpprotocolplugins/group" mrp="applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
       </component>
-      <component id="httptransportplugins" name="HTTP Transport Plugins" introduced="6.2" purpose="optional" class="plugin">
+      <component id="httptransportplugins" filter="s60" name="HTTP Transport Plugins" introduced="6.2" purpose="optional" class="plugin">
         <unit bldFile="applayerpluginsandutils/httptransportplugins/group" mrp="applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
       </component>
     </collection>
diff -r 6482b2868773 -r 753e9b859ae7 package_map.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/package_map.xml	Mon Oct 04 00:53:08 2010 +0300
@@ -0,0 +1,1 @@
+<PackageMap root="sf" layer="mw"/>