Merge RCL_3 fixes with reverted delivery RCL_3 PDK_3.0.2 PDK_3.0.3
authorShabe Razvi <shaber@symbian.org>
Thu, 02 Sep 2010 15:55:27 +0100
branchRCL_3
changeset 41 cdeb3bb916cc
parent 40 a0da872af3fa (current diff)
parent 38 7b05392fe9dc (diff)
Merge RCL_3 fixes with reverted delivery
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/applayerprotocols/wapbase/Group/BLD.INF	Thu Sep 02 15:55:27 2010 +0100
@@ -0,0 +1,132 @@
+// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "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:
+// Wap engine parsers and utilities
+// This file basically provides the information required for building the whole of a component
+// C & C++ style comments are allowed in this file because it's passed through the C++ preprocessor
+// Examples are provided below of the kind of things we're expecting
+// 
+//
+
+/**
+ @file
+*/
+
+
+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
+
+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
+
+//Export of the .dtd files
+//WINSCW UDEB
+../Tdtd/DTDs/si.dtd /epoc32/release/winscw/udeb/z/resource/wappush/si.dtd
+../Tdtd/DTDs/sl.dtd /epoc32/release/winscw/udeb/z/resource/wappush/sl.dtd
+
+//WINSCW UREL
+../Tdtd/DTDs/si.dtd /epoc32/release/winscw/urel/z/resource/wappush/si.dtd
+../Tdtd/DTDs/sl.dtd /epoc32/release/winscw/urel/z/resource/wappush/sl.dtd
+ 
+//WINS UDEB
+../Tdtd/DTDs/si.dtd /epoc32/release/wins/udeb/z/resource/wappush/si.dtd
+../Tdtd/DTDs/sl.dtd /epoc32/release/wins/udeb/z/resource/wappush/sl.dtd
+ 
+//WINS UREL
+../Tdtd/DTDs/si.dtd /epoc32/release/wins/urel/z/resource/wappush/si.dtd
+../Tdtd/DTDs/sl.dtd /epoc32/release/wins/urel/z/resource/wappush/sl.dtd
+ 
+//OTHER PLATFORM
+../Tdtd/DTDs/si.dtd /epoc32/data/z/resource/wappush/si.dtd
+../Tdtd/DTDs/sl.dtd /epoc32/data/z/resource/wappush/sl.dtd
+ 
+//Export of the .tok files
+//WINSCW UDEB
+../../wappushsupport/TokenFiles/si10.tok /epoc32/release/winscw/udeb/z/resource/wappush/si10.tok
+../../wappushsupport/TokenFiles/sl10.tok /epoc32/release/winscw/udeb/z/resource/wappush/sl10.tok
+ 
+//WINSCW UREL
+../../wappushsupport/TokenFiles/si10.tok /epoc32/release/winscw/urel/z/resource/wappush/si10.tok
+../../wappushsupport/TokenFiles/sl10.tok /epoc32/release/winscw/urel/z/resource/wappush/sl10.tok
+ 
+//WINS UDEB
+../../wappushsupport/TokenFiles/si10.tok /epoc32/release/wins/udeb/z/resource/wappush/si10.tok
+../../wappushsupport/TokenFiles/sl10.tok /epoc32/release/wins/udeb/z/resource/wappush/sl10.tok
+ 
+//WINS UREL
+../../wappushsupport/TokenFiles/si10.tok /epoc32/release/wins/urel/z/resource/wappush/si10.tok
+../../wappushsupport/TokenFiles/sl10.tok /epoc32/release/wins/urel/z/resource/wappush/sl10.tok
+ 
+//OTHER PLATFORM
+../../wappushsupport/TokenFiles/si10.tok /epoc32/data/z/resource/wappush/si10.tok
+../../wappushsupport/TokenFiles/sl10.tok /epoc32/data/z/resource/wappush/sl10.tok
+
+
+../inc/attrlut.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(attrlut.h)
+../inc/CBNFParser.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(cbnfparser.h)
+../inc/CBNFNode.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(cbnfnode.h)
+../inc/CDTDModel.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(cdtdmodel.h)
+../inc/cnode.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(cnode.h)
+../inc/cnode.inl SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(cnode.inl)
+../inc/dtdnode.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(dtdnode.h)
+../inc/dtdnode.inl SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(dtdnode.inl)
+../inc/estatus.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(estatus.h)
+../inc/mdptx.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(mdptx.h)
+../inc/wapattrdf.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(wapattrdf.h)
+../bnf/CStack.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(cstack.h)
+../bnf/CStack.inl SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(cstack.inl)
+../bnf/CMarkedStack.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(cmarkedstack.h)
+../bnf/CFragmentedString.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(cfragmentedstring.h)
+../bnf/CRuleMarkedStack.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(crulemarkedstack.h)
+../bnf/CRuleMarkedStack.inl SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(crulemarkedstack.inl)
+../bnf/CMarkedStack.inl SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(cmarkedstack.inl)
+../bnf/CNoDeleteAttribute.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(cnodeleteattribute.h)
+../inc/Wapengstd.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(wapengstd.h) 
+../inc/WapTestUtils.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(waptestutils.h)
+../inc/WapTestUtils.inl SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(waptestutils.inl)
+../inc/PragmaMessage.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(pragmamessage.h)
+
+
+PRJ_MMPFILES
+// specify the .mmp files required for building the important component releasables
+// note that you should specify any .mmp files for test programs further down the file.
+//
+// It's best if the .MMP files are specified in the order in which the components are
+// built, but that eventually shouldn't matter
+//
+// Use C++ style #defines to denote that a component is only built for a particular platform
+//
+// specify "tidy" if the component you need to build doesn't need to be released to
+// the rest of the company
+// specify "ignore" if the MMP file exists but should be ignored - William wants this!
+
+../mmpfiles/bnf.mmp
+../mmpfiles/dtdmdl.mmp
+../mmpfiles/wnode.mmp
+../mmpfiles/wutil.mmp
+
+PRJ_TESTMMPFILES
+// specify the .mmp files required for building any test programs here
+//
+// you can specify "manual" to denote that a test should be listed in a generated
+// batch file for running a group of tests which require user input during testing.
+// you can specify "support" to denote that a file is a test support file and shouldn't
+// be listed in a batch file for running a group of tests
+// By default, each test will be listed in a batch file for running a group of tests
+// which can be left to run without requiring watching over by the person running the tests,
+// i.e. tests where no user input is required.  The default will apply if neither "manual"
+// or "support" is specified.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/applayerprotocols/wapbase/Group/wap-browser_wapbase.history.xml	Thu Sep 02 15:55:27 2010 +0100
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<relnotes name="WAP Base">
+  <purpose>
+  </purpose>
+
+  <preq number="1182" title="GNU Make-based build system" revision="003">
+    Phase-I of Preq-1182 GNU Make-based build system, Filename Policy check updations
+  </preq>
+
+  <defect number="DEF093413" title="Bad distribution.policy file Schedule 12 category" revision="002">
+    Modified bad distribution.policy files
+  </defect>
+
+  <defect number="DEF074710" title="Wapbrowser DTD/TOK files are in an unsecure location" revision="001">
+    Wapbrowser DTD/TOK files are in an unsecure location
+    The DTD/TOK files have been moved to a secure location
+  </defect>
+</relnotes>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp	Thu Sep 02 15:55:27 2010 +0100
@@ -0,0 +1,30 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "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: 
+#
+
+component	wap-browser_wapbase
+source	\sf\mw\netprotocols\applayerprotocols\wapbase
+
+#GeorgeS: Files below are part of wap-browser_wappushsupport.mrp
+
+#source	\sf\os\unref\orphan\comgen\wap-browser\Wap6.2 Release Notes.txt
+
+binary	\sf\mw\netprotocols\applayerprotocols\wapbase\Group	all
+exports	\sf\mw\netprotocols\applayerprotocols\wapbase\Group
+notes_source	\component_defs\release.src
+
+
+ipr E 
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/applayerprotocols/wappushsupport/Group/BLD.INF	Thu Sep 02 15:55:27 2010 +0100
@@ -0,0 +1,67 @@
+// Copyright (c) 2000-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "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:
+// This file basically provides the information required for building the whole of a component
+// C & C++ style comments are allowed in this file because it's passed through the C++ preprocessor
+// Examples are provided below of the kind of things we're expecting
+// 
+//
+
+
+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
+
+
+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
+
+../Group/WapPushSupport.iby             /epoc32/rom/include/wappushsupport.iby
+../inc/MWapPluginSP.h                   SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(mwappluginsp.h)
+../inc/MFrameworkSP.h                   SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(mframeworksp.h)
+../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)
+../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)
+../inc/waplog.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(waplog.h)
+../inc/logdef.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(logdef.h)
+../inc/ansicomp.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(ansicomp.h)
+
+// Converter token file
+../TokenFiles/si10.tok		/epoc32/wins/c/system/data/plugins/si10.tok
+../TokenFiles/sl10.tok		/epoc32/wins/c/system/data/plugins/sl10.tok
+
+PRJ_MMPFILES
+// specify the .mmp files required for building the important component releasables
+// note that you should specify any .mmp files for test programs further down the file.
+//
+// It's best if the .MMP files are specified in the order in which the components are
+// built, but that eventually shouldn't matter
+//
+// Use C++ style #defines to denote that a component is only built for a particular platform
+//
+// specify "tidy" if the component you need to build doesn't need to be released to
+// the rest of the company
+// specify "ignore" if the MMP file exists but should be ignored - William wants this!
+
+../mmpfiles/XmlElement.mmp
+../mmpfiles/WbxmlLib.mmp
+../mmpfiles/HTTPResponse.mmp
+../mmpfiles/XmlLib.mmp
+PRJ_TESTMMPFILES
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/applayerprotocols/wappushsupport/Group/Wap6.2 Release Notes.txt	Thu Sep 02 15:55:27 2010 +0100
@@ -0,0 +1,222 @@
+WAP6.2 Release 0.8 29-Sep-2003
+==============================
+Released into:	
+Built against:	
+Released By:	Omer Saleem
+
+Summary
+=======
+Removed all test code from WapBase. The wapbase test code is never built or run and cannot be built due to missing components and a number of build errors. This code redundant and has been removed as part of work to fix leavescan errors.
+
+
+WAP6.2 Release 0.7 22-Jan-2003
+==============================
+Released into:	Typhoon Release 2107
+Built against:	Typhoon 2106
+Released By:	Omer Saleem
+
+Summary
+=======
+Fixed defect INC012136 - WAP Push: Framework receiving WP message assumes that content type is always well known
+
+
+WAP6.2 Release 0.6 23-Oct-2001
+==============================
+Released into:	GT Mainline 536
+Built against:	GT Mainline 531 (WINS and ARMI)
+Released By:	David Cunado
+
+Summary
+=======
+Removed all Wap Components except those needed for WAP Push. 
+The dlls from the WapPlugins Component that are needed are built as part of WapPushSupport component. 
+All the Wap Code remains in the mainline, so this new component just uses uses the existing code.
+This has no new code, just a new bld.inf that uses all existing code.
+
+WAP6.2 Release 0.5 29-Aug-2001
+==============================
+Released into:	GT Mainline 497
+Built against:	GT Mainline 495 (WINS and ARM4)
+Released By:	Omer Saleem
+
+Summary
+=======
+
+1) Fixed iby files for correct rom building
+2) Converted wap push plugins to use ECOM plugin architecture
+3) Updated Rose models
+4) Updated Waptestui to include HTTP & WSP support and canceling functionality
+
+Issues
+======
+
+1. Architecture issue + breaks BC to change.
+Wap control is giving UI access to top level plugin via API for copy and select all functionality. 
+Sharing of RFs around Wap GT as its being connected to over 30 times in release code
+
+2. Trivial code cleanup stuff
+Epoc32\include folder is polluted with wap headers and perhaps go into a wap subfolder. 
+A lot of redundant code and sub-components (eg wbxmltest, turl). 
+
+3. Building issues
+Should wappush be in the platform_build because its not at the moment. - Answer is No its really a separate component.
+
+4. Configuration issues
+waprd is removed from gt.txt and so is not build with gt code, it has been moved to quartz - This needs to be fixed with the Quartz team for 6.2 Effectively they have grabbed some GT code.
+
+5. Known Defects
+Defect with wapstack is failing wap mainline build smoke tests - Being looked @ by Chris Trick, and should have been resolved by EOW 35
+
+6. Hardware testing
+Minimal hardware testing has been carried out on assabet. Problems that exist was that it would not connect using NT Ras and rendered decks had to be forced to redraw by pressing an arrow key to display the deck.
+
+
+
+WAP6.2 Release 0.4 08-Aug-2001
+==============================
+Released into:	GT Mainline 483
+Built against:	GT Mainline 481 (WINS and ARMI)
+Released By:	Omer Saleem
+
+Summary
+=======
+
+1) Fixed all Wap test harnesses
+2) Added missing distribution.policy files
+3) Implemented ECOM plugin architure and removed the old one
+4) Converted all plugins to new ECOM plugins
+5) Fixed rendering defects SAM-4Z7HMU, UDN-4YXHHZ, UDN-4YXDPT, SAM-4YGD4M.
+6) Changed MMP's to reduce warnings
+
+
+WAP6.2 Release 0.3 13-Jul-2001 (Part III)
+========================================
+Released into:	GT Mainline 465
+Built against:  GT Mainline 462 (WINS and ARMI)
+Released By:	David Cunado
+
+Summary
+=======
+
+1. Adding missing export
+
+WAP6.2 Release 0.3 13-Jul-2001 (Part II)
+========================================
+Released into:	GT Mainline 465
+Built against:  GT Mainline 462 (WINS and ARMI)
+Released By:	David Cunado
+
+Summary
+=======
+
+1.Adding WapTestUi App.
+
+WAP6.2 Release 0.3 13-Jul-2001 (Part I)
+=======================================
+Released into:	GT Mainline 465
+Built against:  GT Mainline 462 (WINS and ARMI)
+Released By:	David Cunado
+
+Summary
+=======
+
+1. Added CommDb 2-box solutions changes.
+2. Removed WapUtils component from build list for development platform_build.
+3. Changed TWmlLibMachine and TWapLCtx to use the changed Wap Local context Dll name - now is WapLCtx.lib. Also had other updates. Note - TWmlLibMachine syil has linkage problems (but is test code - fix on next release).
+4. Changed MMP files through-out to use INetProtUtil.lib instead of WapUtils.lib.
+5. Fixed TEng to build and run - fixed memory leak and bulid problems due to MDialogProvider API changes,
+6. Fix for wap rendering for the hotspot mis-alignment - not yet complete.
+7. Added unknown content handler - included changes to wmlscriptdatahandler to replace CDefaultDataHandler with CUnknownContentDataHandler.
+8. Added distribution policy files wtai
+
+
+WAP6.2 Release 0.2 13-Jun-2001
+==============================
+Released into:	GT Mainline 443
+Built against:  GT Mainline 441 (ARMI)
+Released By:	David Cunado
+Changelist:	???????
+
+Summary
+=======
+Changes to WapEngine.iby to include uaprof and wtai dlls.
+
+WAP6.2 Release 0.2 11-Jun-2001
+==============================
+Released into:	GT Mainline 441
+Built against:  GT Mainline 435 (WINS and ARMI)
+Released By:	David Cunado
+Changelist:	???????
+
+Summary
+=======
+Changes to TEng test code to implement new functions in MDialogProvider class.
+
+WAP6.2 Release 0.1 04-Jun-2001
+===================================
+Released into:	GT Mainline 437
+Built against:  GT Mainline 435 (WINS and ARMI)
+Released By:	Omer Saleem
+Uses:		EUSER EFSRV ETEL CNTMODEL GSMAVD COMMDB BAFL
+Changelist:	??????
+
+Summary
+=======
+
+This release contains two new components for the WAP Browser 6.2, these are for WTAI Public and UAProfs, each is detailed below:
+
+1) This is the first iteration release for the WTAI Public component of the GT 0101 Wap Browser 6.2 project. This release for WTAI Public involves four main changes:
+* wtaipublic.dll contains the core functionality required by WTAI
+* wtaiplugin.dll provided the URI scheme handler for the wtai scheme
+* changes to the WMLScript engine to incorporate the WTAI scripting commands
+* changes to the MWapControlObserver (MDialogProvider) interface to provide the new required dialog for WTAI
+
+2) This is the first iteration release for the UAProf component of the GT 0101 Wap Browser 6.2 project. This release provides the following deliverables:
+* uaprof.dll This provides all the functionality required for UAProf using profiles and profile-diffs supplied in the form of files in a specific directory
+* Changes made to the HTTP plugin to use the UAProf functionality to sent the header data requires and parse any returned UAProf data
+
+Use Cases Delivered
+===================
+
+WTAI Public:
+------------
+All the use cases outlined in the document "GT0101 UCM.03 WTAI 6.2 Customer Use Case Analysis.doc" have been delivered in this release. This includes:
+* Making a voice call using a URI
+* Making a voice call using WMLScript
+* Sending DTMF tones using a URI
+* Sending DTMF tones using WMLScript
+* Adding a phonebook entry using a URI
+* Adding a phonebook entry using WMLScript
+* Providing a method to cancel dialing a voice call
+* Providing a method to cancel sending DTMF tones
+
+UAProfs:
+--------
+All the use cases detailed in the document "GT0101 UCM.04 UAProf 6.2 Customer Use Case Analysis.doc" have been implemented in this release with the exception of the use cases related to the RDF Compiler which is fulfilled in the RDF Compiler component. The use cases include:
+* Establish UAProf-aware WSP Session
+* Request Content Generate for Device CPI Cached at WAP Gateway
+* Form Device CPI
+* Add a Profile to the Device CPI
+* Remove a Profile from the Device CPI
+* Add a User-Preference to the Device CPI
+* Remove a User-Preference from the Device CPI
+
+More Information
+================
+
+The changes made in this release change the MWapControlObserver interface which is implemented by the WAP UI, therefore the changes made will break the UI. To allow the UI to compile, the WAP UI will also be modified with stub functions to allow it to compile and will later be implemented by the WAP UI team.
+
+This release of the UAProf component contains the implementation supporting UAProf including dynamic profile data building. However for this release HTTP will not be using the dynamic profiles and profiles will only be required for the establishment of the session only.
+
+Known Issues
+============
+
+WTAI Public:
+------------
+* When WTAI makes a call, any current active calls (data or voice) are put on hold and the new voice call is made. We need to know how this should be handled, whether we will be using GPRS with an always on feel, or whether we should hang up a data call if one exists.
+* When WTAI makes a call, does the phone app pick up the new call or do we need to inform it of the new call
+* When returning the result of a WTAI function invoked from a URI, does the variable name after the '!' have to be var_name or $var_name
+
+UAProfs:
+--------
+* The current implementation provides dynamic profiles by changing the number of CPI files in the profile depot directory. This means that profiles can only be changed by adding and removing files, not by modifying existing ones.
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/applayerprotocols/wappushsupport/Group/WapPushSupport.iby	Thu Sep 02 15:55:27 2010 +0100
@@ -0,0 +1,43 @@
+// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "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:
+// IBY file for WAP Components needed for Hurricane
+// 
+//
+
+#ifndef __WAPPUSHSUPPORT_IBY__
+#define __WAPPUSHSUPPORT_IBY__
+
+#include <stdlib.iby>
+
+// Components from WAPBASE
+
+file=ABI_DIR\BUILD_DIR\Wutil.dll				System\Libs\Wutil.dll
+file=ABI_DIR\BUILD_DIR\wnode.dll				System\Libs\Wnode.dll
+file=ABI_DIR\BUILD_DIR\dtdmdl.dll				System\Libs\Dtdmdl.dll
+file=ABI_DIR\BUILD_DIR\bnf.dll					System\Libs\Bnf.dll
+
+#ifdef __SECURE_DATA__
+data=MULTI_LINGUIFY(RSC ZRESOURCE\Errors\WapBaseErr	Resource\Errors\WapBaseErr)
+#else
+data=MULTI_LINGUIFY(RSC ZSYSTEM\Errors\WapBaseErr	System\Errors\WapBaseErr)
+#endif //__SECURE_DATA__
+
+// Components from WAPPLUGINS
+
+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
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.history.xml	Thu Sep 02 15:55:27 2010 +0100
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<relnotes name="WAP Push Handlers">
+  <purpose>
+    Plugins and handlers including SISL (Several Interfaces, Single Logic) supporting WAP Push, uses WAP message API
+  </purpose>
+
+  <preq number="775" title="Alignment of CBR and System Model components" revision="004">
+    The contents of wapengine/inc and wapservers/inc are moved to wapplugins/inc.Also the content of WapPushSupport/group is moved to wapplugins/group.
+  </preq>
+
+  <preq number="1182" title="GNU Make-based build system" revision="003">
+    Phase-I of Preq-1182 GNU Make-based build system, Filename Policy check updations
+  </preq>
+
+  <defect number="DEF093413" title="Bad distribution.policy file Schedule 12 category" revision="002">
+    Modified bad distribution.policy files
+  </defect>
+
+  <defect number="INC088495" title="wappushsupport bld file incorrect" revision="001">
+    Obsolete header file paths and mmp file paths are removed from /wapplugins/group/bld.inf
+  </defect>
+</relnotes>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp	Thu Sep 02 15:55:27 2010 +0100
@@ -0,0 +1,28 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "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: 
+#
+
+component	wap-browser_wappushsupport
+source	\sf\mw\netprotocols\applayerprotocols\wappushsupport
+
+
+
+binary	\sf\mw\netprotocols\applayerprotocols\wappushsupport\Group	all
+exports	\sf\mw\netprotocols\applayerprotocols\wappushsupport\Group
+notes_source	\component_defs\release.src
+
+
+ipr E 
+