# HG changeset patch
# User hgs
# Date 1284485122 -19800
# Node ID 9e0e0bac3dc536e6407e96288bef0d41253a0c36
# Parent  5ba2fbae6cfe4b6d62b6401582641a1d53184375
201037_03

diff -r 5ba2fbae6cfe -r 9e0e0bac3dc5 layers.sysdef.xml
--- a/layers.sysdef.xml	Wed Sep 01 14:40:02 2010 +0530
+++ b/layers.sysdef.xml	Tue Sep 14 22:55:22 2010 +0530
@@ -8,6 +8,16 @@
     <layer name="mw_layer">
       <module name="messagingmw">
         <unit unitID="MeCo.messagingmw" mrp="" bldFile="&layer_real_source_path;/group" name="messagingmw" />
+        <unit unitID="MeCo.biomsgfw" mrp="" bldFile="&layer_real_source_path;/messagingfw/biomsgfw/group" name="biomsgfw" />
+        <unit unitID="MeCo.msgconf" mrp="" bldFile="&layer_real_source_path;/messagingfw/msgconf/group" name="msgconf" />
+        <unit unitID="MeCo.msgsrvnstore" mrp="" bldFile="&layer_real_source_path;/messagingfw/msgsrvnstore/group" name="msgsrvnstore" />
+        <unit unitID="MeCo.msgurlhandler" mrp="" bldFile="&layer_real_source_path;/messagingfw/msgurlhandler/group" name="msgurlhandler" />
+        <unit unitID="MeCo.scheduledsendmtm" mrp="" bldFile="&layer_real_source_path;/messagingfw/scheduledsendmtm/group" name="scheduledsendmtm" />
+        <unit unitID="MeCo.sendas" mrp="" bldFile="&layer_real_source_path;/messagingfw/sendas/group" name="sendas" />
+        <unit unitID="MeCo.suplsmshandler" mrp="" bldFile="&layer_real_source_path;/messagingfw/suplsmshandler/group" name="suplsmshandler" />
+        <unit unitID="MeCo.suplwappushhandler" mrp="" bldFile="&layer_real_source_path;/messagingfw/suplwappushhandler/group" name="suplwappushhandler" />
+        <unit unitID="MeCo.wappushfw" mrp="" bldFile="&layer_real_source_path;/messagingfw/wappushfw/group" name="wappushfw" />
+        <unit unitID="MeCo.watcherfw" mrp="" bldFile="&layer_real_source_path;/messagingfw/watcherfw/group" name="watcherfw" />
       </module>
     </layer>
   </systemModel>
diff -r 5ba2fbae6cfe -r 9e0e0bac3dc5 messagingfw/msgsrvnstore/server/group/MSGS.mmp
--- a/messagingfw/msgsrvnstore/server/group/MSGS.mmp	Wed Sep 01 14:40:02 2010 +0530
+++ b/messagingfw/msgsrvnstore/server/group/MSGS.mmp	Tue Sep 14 22:55:22 2010 +0530
@@ -102,7 +102,7 @@
 TARGETPATH resource/messaging
 TARGET MSGS.rsc
 HEADER
-LANG	SC
+LANGUAGE_IDS
 END
 
 #include "../../../msgtests/group/msgopt.mph"
diff -r 5ba2fbae6cfe -r 9e0e0bac3dc5 messagingfw/msgsrvnstore/server/group/MSGS_AutoShutdown.mmp
--- a/messagingfw/msgsrvnstore/server/group/MSGS_AutoShutdown.mmp	Wed Sep 01 14:40:02 2010 +0530
+++ b/messagingfw/msgsrvnstore/server/group/MSGS_AutoShutdown.mmp	Tue Sep 14 22:55:22 2010 +0530
@@ -106,7 +106,7 @@
 TARGETPATH resource/messaging
 TARGET MSGS.rsc
 HEADER
-LANG	SC
+LANGUAGE_IDS
 END
 
 #include "../../../msgtests/group/msgopt.mph"
diff -r 5ba2fbae6cfe -r 9e0e0bac3dc5 messagingfw/msgsrvnstore/server/src/CMsvPlainBodyText.cpp
--- a/messagingfw/msgsrvnstore/server/src/CMsvPlainBodyText.cpp	Wed Sep 01 14:40:02 2010 +0530
+++ b/messagingfw/msgsrvnstore/server/src/CMsvPlainBodyText.cpp	Tue Sep 14 22:55:22 2010 +0530
@@ -1120,7 +1120,7 @@
 void CMsvPlainBodyText::RevertL()
 	{
 	iFile.Close();
-	if(!iIsCommitted)
+	if(!iIsCommitted && iMsvFileStatus == EMsvFileWriting)
 		{
 		iMsvStoreManager.DeletePlainTextFileL(iMessageId);
 		}
diff -r 5ba2fbae6cfe -r 9e0e0bac3dc5 messagingfw/suplsmshandler/test/testserver/group/Bld.inf
--- a/messagingfw/suplsmshandler/test/testserver/group/Bld.inf	Wed Sep 01 14:40:02 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-// Copyright (c) 2007-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:
-// A Bld.inf file for the SUPL SMS Trigger Unit Test Suite
-// 
-//
-
-PRJ_TESTEXPORTS
-../scripts/Te_LbsSuplSmsTriggerSuite.script		c:/testdata/scripts/te_lbssuplsmstriggersuite.script
-./Te_LbsSuplSmsTriggerSuite.iby   		/epoc32/rom/include/te_lbssuplsmstriggersuite.iby
-../testdata/lbssuplsmstriggerconfig.txt		c:/testdata/configs/lbssuplsmstriggerconfig.txt
-
-
-PRJ_TESTMMPFILES
-Te_LbsSuplSmsTriggerSuite.mmp
diff -r 5ba2fbae6cfe -r 9e0e0bac3dc5 messagingfw/suplsmshandler/test/testserver/group/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/suplsmshandler/test/testserver/group/bld.inf	Tue Sep 14 22:55:22 2010 +0530
@@ -0,0 +1,25 @@
+// Copyright (c) 2007-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:
+// A Bld.inf file for the SUPL SMS Trigger Unit Test Suite
+// 
+//
+
+PRJ_TESTEXPORTS
+../scripts/Te_LbsSuplSmsTriggerSuite.script		c:/testdata/scripts/te_lbssuplsmstriggersuite.script
+./Te_LbsSuplSmsTriggerSuite.iby   		/epoc32/rom/include/te_lbssuplsmstriggersuite.iby
+../testdata/lbssuplsmstriggerconfig.txt		c:/testdata/configs/lbssuplsmstriggerconfig.txt
+
+
+PRJ_TESTMMPFILES
+Te_LbsSuplSmsTriggerSuite.mmp
diff -r 5ba2fbae6cfe -r 9e0e0bac3dc5 messagingfw/wappushfw/examples/PushAppHandlerEx/BLD.INF
--- a/messagingfw/wappushfw/examples/PushAppHandlerEx/BLD.INF	Wed Sep 01 14:40:02 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-// 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:
-// Push Plugin Example Bld.inf
-// 
-//
-
-PRJ_PLATFORMS
-    WINS
-    WINSCW
-    ARMI
-    THUMB
-    ARM4
-
-
-PRJ_EXPORTS
-
-PRJ_MMPFILES
-./PushAppHandlerEx.mmp
-
-PRJ_TESTMMPFILES
-/Wap-Browser/wappush/tpush/DummyStack/Dummywapstack.mmp
-./Test/t_push.mmp
-
-
-PRJ_TESTEXPORTS
-./test/pushtestcases.ini /epoc32/wins/c/pushtestcases.ini
-
diff -r 5ba2fbae6cfe -r 9e0e0bac3dc5 messagingfw/wappushfw/examples/PushAppHandlerEx/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/wappushfw/examples/PushAppHandlerEx/bld.inf	Tue Sep 14 22:55:22 2010 +0530
@@ -0,0 +1,38 @@
+// 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:
+// Push Plugin Example Bld.inf
+// 
+//
+
+PRJ_PLATFORMS
+    WINS
+    WINSCW
+    ARMI
+    THUMB
+    ARM4
+
+
+PRJ_EXPORTS
+
+PRJ_MMPFILES
+./PushAppHandlerEx.mmp
+
+PRJ_TESTMMPFILES
+/Wap-Browser/wappush/tpush/DummyStack/Dummywapstack.mmp
+./Test/t_push.mmp
+
+
+PRJ_TESTEXPORTS
+./test/pushtestcases.ini /epoc32/wins/c/pushtestcases.ini
+
diff -r 5ba2fbae6cfe -r 9e0e0bac3dc5 messagingfw/wappushfw/group/BLD.INF
--- a/messagingfw/wappushfw/group/BLD.INF	Wed Sep 01 14:40:02 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-// 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:
-// WAP 1.2 Push - GT
-// Wap push
-// 
-//
-
-/**
- @file
-*/
-
-
-
-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
-
-PRJ_PLATFORMS
-DEFAULT
-
-// Subproject builds
-#include "../pushutils/group/bld.inf"
-#include "../PushMsgEntry/group/bld.inf"
-#include "../SISLPushMsgUtils/group/bld.inf"
-#include "../MiscPushMsgUtils/group/bld.inf"
-#include "../plugins/group/bld.inf"
-#include "../plugins/WapUriLookup/group/bld.inf"
-#include "../SISLContentHandlers/group/bld.inf"
-#include "../pushwatcher/group/BLD.INF"
-#include "../pushmtm/group/BLD.INF"
-#include "../tpush/BLD.INF"
-#include "../rom/BLD.INF"
-#include "../ROContentHandler/group/bld.inf"
-#include "../ROAPTContentHandler/group/bld.inf"
-#include "../tpushscriptbased/BLD.INF"
-
-PRJ_MMPFILES
diff -r 5ba2fbae6cfe -r 9e0e0bac3dc5 messagingfw/wappushfw/group/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/wappushfw/group/bld.inf	Tue Sep 14 22:55:22 2010 +0530
@@ -0,0 +1,50 @@
+// 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:
+// WAP 1.2 Push - GT
+// Wap push
+// 
+//
+
+/**
+ @file
+*/
+
+
+
+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
+
+PRJ_PLATFORMS
+DEFAULT
+
+// Subproject builds
+#include "../pushutils/group/bld.inf"
+#include "../PushMsgEntry/group/bld.inf"
+#include "../SISLPushMsgUtils/group/bld.inf"
+#include "../MiscPushMsgUtils/group/bld.inf"
+#include "../plugins/group/bld.inf"
+#include "../plugins/WapUriLookup/group/bld.inf"
+#include "../SISLContentHandlers/group/bld.inf"
+#include "../pushwatcher/group/bld.inf"
+#include "../pushmtm/group/bld.inf"
+#include "../tpush/bld.inf"
+#include "../rom/bld.inf"
+#include "../ROContentHandler/group/bld.inf"
+#include "../ROAPTContentHandler/group/bld.inf"
+#include "../tpushscriptbased/bld.inf"
+
+PRJ_MMPFILES
diff -r 5ba2fbae6cfe -r 9e0e0bac3dc5 messagingfw/wappushfw/pushmtm/group/BLD.INF
--- a/messagingfw/wappushfw/pushmtm/group/BLD.INF	Wed Sep 01 14:40:02 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-// 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:
-// WapPushMtm
-// 
-//
-
-PRJ_PLATFORMS
-
-
-PRJ_EXPORTS
-
-PRJ_MMPFILES
-../../pushmtm/group/pushmtmclientserver.mmp
-
-
-PRJ_TESTMMPFILES
-
-PRJ_TESTEXPORTS
diff -r 5ba2fbae6cfe -r 9e0e0bac3dc5 messagingfw/wappushfw/pushmtm/group/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/wappushfw/pushmtm/group/bld.inf	Tue Sep 14 22:55:22 2010 +0530
@@ -0,0 +1,29 @@
+// 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:
+// WapPushMtm
+// 
+//
+
+PRJ_PLATFORMS
+
+
+PRJ_EXPORTS
+
+PRJ_MMPFILES
+../../pushmtm/group/pushmtmclientserver.mmp
+
+
+PRJ_TESTMMPFILES
+
+PRJ_TESTEXPORTS
diff -r 5ba2fbae6cfe -r 9e0e0bac3dc5 messagingfw/wappushfw/pushwatcher/group/BLD.INF
--- a/messagingfw/wappushfw/pushwatcher/group/BLD.INF	Wed Sep 01 14:40:02 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-// 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:
-// WapPush
-// 
-//
-
-PRJ_PLATFORMS
-
-
-PRJ_EXPORTS
-../../pushwatcher/inc/pushlog.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(push/pushlog.h)
-	
-
-PRJ_MMPFILES
-../../pushwatcher/group/pushwatcher.mmp
-
-PRJ_TESTMMPFILES
-../../pushwatcher/test/t_pushwatcherfinalclose.mmp	manual
-
-PRJ_TESTEXPORTS
diff -r 5ba2fbae6cfe -r 9e0e0bac3dc5 messagingfw/wappushfw/pushwatcher/group/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/wappushfw/pushwatcher/group/bld.inf	Tue Sep 14 22:55:22 2010 +0530
@@ -0,0 +1,31 @@
+// 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:
+// WapPush
+// 
+//
+
+PRJ_PLATFORMS
+
+
+PRJ_EXPORTS
+../../pushwatcher/inc/pushlog.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(push/pushlog.h)
+	
+
+PRJ_MMPFILES
+../../pushwatcher/group/pushwatcher.mmp
+
+PRJ_TESTMMPFILES
+../../pushwatcher/test/t_pushwatcherfinalclose.mmp	manual
+
+PRJ_TESTEXPORTS
diff -r 5ba2fbae6cfe -r 9e0e0bac3dc5 messagingfw/wappushfw/rom/BLD.INF
--- a/messagingfw/wappushfw/rom/BLD.INF	Wed Sep 01 14:40:02 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-// 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:
-// WapPush
-// 
-//
-
-PRJ_EXPORTS
-
-../rom/wappush.iby /epoc32/rom/include/wappush.iby
-../rom/sislwappush.iby /epoc32/rom/include/sislwappush.iby
-../rom/miscpushutils.iby /epoc32/rom/include/miscpushutils.iby
-../rom/wapurilookup.iby /epoc32/rom/include/wapurilookup.iby
-../rom/rohandler.iby /epoc32/rom/include/rohandler.iby
diff -r 5ba2fbae6cfe -r 9e0e0bac3dc5 messagingfw/wappushfw/rom/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/wappushfw/rom/bld.inf	Tue Sep 14 22:55:22 2010 +0530
@@ -0,0 +1,24 @@
+// 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:
+// WapPush
+// 
+//
+
+PRJ_EXPORTS
+
+../rom/wappush.iby /epoc32/rom/include/wappush.iby
+../rom/sislwappush.iby /epoc32/rom/include/sislwappush.iby
+../rom/miscpushutils.iby /epoc32/rom/include/miscpushutils.iby
+../rom/wapurilookup.iby /epoc32/rom/include/wapurilookup.iby
+../rom/rohandler.iby /epoc32/rom/include/rohandler.iby
diff -r 5ba2fbae6cfe -r 9e0e0bac3dc5 messagingfw/wappushfw/tpush/BLD.INF
--- a/messagingfw/wappushfw/tpush/BLD.INF	Wed Sep 01 14:40:02 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-// 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:
-// WapPush
-// 
-//
-
-PRJ_PLATFORMS
-
-
-PRJ_EXPORTS
-// none		
-
-PRJ_MMPFILES
-
-PRJ_TESTMMPFILES
-../tpush/DummyStack/Dummywapstack.mmp
-../tpush/t_wappush.mmp
-../tpush/plugins/tpushapphandler/tpushapphandler.mmp
-
-PRJ_TESTEXPORTS
-../rom/twappush.iby /epoc32/rom/include/twappush.iby
-
-//Sub project builds
-
-#include "../tpush/RefTestAgent/group/bld.inf"
diff -r 5ba2fbae6cfe -r 9e0e0bac3dc5 messagingfw/wappushfw/tpush/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/wappushfw/tpush/bld.inf	Tue Sep 14 22:55:22 2010 +0530
@@ -0,0 +1,36 @@
+// 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:
+// WapPush
+// 
+//
+
+PRJ_PLATFORMS
+
+
+PRJ_EXPORTS
+// none		
+
+PRJ_MMPFILES
+
+PRJ_TESTMMPFILES
+../tpush/DummyStack/Dummywapstack.mmp
+../tpush/t_wappush.mmp
+../tpush/plugins/tpushapphandler/tpushapphandler.mmp
+
+PRJ_TESTEXPORTS
+../rom/twappush.iby /epoc32/rom/include/twappush.iby
+
+//Sub project builds
+
+#include "../tpush/RefTestAgent/group/bld.inf"
diff -r 5ba2fbae6cfe -r 9e0e0bac3dc5 messagingfw/wappushfw/tpushscriptbased/BLD.INF
--- a/messagingfw/wappushfw/tpushscriptbased/BLD.INF	Wed Sep 01 14:40:02 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-// Copyright (c) 2007-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:
-// WapPush
-// 
-//
-
-PRJ_PLATFORMS
-
-
-PRJ_EXPORTS
-// none		
-
-PRJ_MMPFILES
-
-PRJ_TESTMMPFILES
-../tpushscriptbased/t_wappushscriptbased.mmp
-
-PRJ_TESTEXPORTS
-./wapini/wap.ini			/epoc32/winscw/c/httptest/wapini/wap.ini
-./testdata/ineturilist.xml		z:/ineturilist/testdata/ineturilist_tpushscriptbased.xml
-
-
-
diff -r 5ba2fbae6cfe -r 9e0e0bac3dc5 messagingfw/wappushfw/tpushscriptbased/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/wappushfw/tpushscriptbased/bld.inf	Tue Sep 14 22:55:22 2010 +0530
@@ -0,0 +1,34 @@
+// Copyright (c) 2007-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:
+// WapPush
+// 
+//
+
+PRJ_PLATFORMS
+
+
+PRJ_EXPORTS
+// none		
+
+PRJ_MMPFILES
+
+PRJ_TESTMMPFILES
+../tpushscriptbased/t_wappushscriptbased.mmp
+
+PRJ_TESTEXPORTS
+./wapini/wap.ini			/epoc32/winscw/c/httptest/wapini/wap.ini
+./testdata/ineturilist.xml		z:/ineturilist/testdata/ineturilist_tpushscriptbased.xml
+
+
+
diff -r 5ba2fbae6cfe -r 9e0e0bac3dc5 package_definition.xml
--- a/package_definition.xml	Wed Sep 01 14:40:02 2010 +0530
+++ b/package_definition.xml	Tue Sep 14 22:55:22 2010 +0530
@@ -44,46 +44,46 @@
    <component id="muiuutils" name="Messaging Center UI Utilities" class="api" filter="s60" introduced="^4">
       <unit bldFile="messagingfw/muiuutils/group"/>
    </component>
-   <component id="scheduledsendmtm" name="Scheduled Send MTM" introduced="6.0" purpose="optional" class="plugin">
+   <component id="scheduledsendmtm" name="Scheduled Send MTM" introduced="6.0" purpose="optional" class="plugin" filter="s60>
     <unit bldFile="messagingfw/scheduledsendmtm/group" mrp="messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
    </component>
-   <component id="msgsrvnstore" name="Message Server and Store" purpose="optional">
+   <component id="msgsrvnstore" name="Message Server and Store" purpose="optional" filter="s60>
     <unit bldFile="messagingfw/msgsrvnstore/group" mrp="messagingfw/msgsrvnstore/group/messaging_framework.mrp"/>
    </component>
-   <component id="biomsgfw" name="BIO Messaging Framework" introduced="6.0" purpose="optional">
+   <component id="biomsgfw" name="BIO Messaging Framework" introduced="6.0" purpose="optional" filter="s60>
     <unit bldFile="messagingfw/biomsgfw/group" mrp="messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
    </component>
-   <component id="msgconf" name="Messaging Config" introduced="^2" purpose="optional" class="config">
+   <component id="msgconf" name="Messaging Config" introduced="^2" purpose="optional" class="config" filter="s60>
     <unit bldFile="messagingfw/msgconf/group" mrp="messagingfw/msgconf/group/messaging_config.mrp"/>
    </component>
-   <component id="watcherfw" name="Watcher Framework" purpose="optional">
+   <component id="watcherfw" name="Watcher Framework" purpose="optional" filter="s60>
     <unit bldFile="messagingfw/watcherfw/group" mrp="messagingfw/watcherfw/group/messaging_watcher.mrp"/>
    </component>
-   <component id="msgtest" name="Messaging Test" purpose="development">
+   <component id="msgtest" name="Messaging Test" purpose="development" filter="s60,test>
     <unit bldFile="messagingfw/msgtest/group" mrp="messagingfw/msgtest/group/messaging_test.mrp"/>
    </component>
-   <component id="msgtests" name="Messaging Tests" purpose="development" filter="test">
+   <component id="msgtests" name="Messaging Tests" purpose="development" filter="s60,test">
     <unit mrp="messagingfw/msgtests/group/messaging.mrp" bldFile="messagingfw/msgtests/group"/>
    </component>
-   <component id="msgtestfw" name="Messaging Test Framework" deprecated="^3" purpose="development" filter="test">
+   <component id="msgtestfw" name="Messaging Test Framework" deprecated="^3" purpose="development" filter="s60,test">
     <unit mrp="messagingfw/msgtestfw/group/messaging_testframework.mrp" bldFile="messagingfw/msgtestfw/group"/>
    </component>
-   <component id="msgtestproduct" name="Messaging Test Product" purpose="development" filter="test">
+   <component id="msgtestproduct" name="Messaging Test Product" purpose="development" filter="s60,test">
     <unit mrp="messagingfw/msgtestproduct/group/messaging_testproduct.mrp" bldFile="messagingfw/msgtestproduct/group"/>
    </component>
-   <component id="sendas" name="Send As" purpose="optional">
+   <component id="sendas" name="Send As" purpose="optional" filter="s60>
     <unit bldFile="messagingfw/sendas/group" mrp="messagingfw/sendas/group/messaging_sendas2.mrp"/>
    </component>
-   <component id="msgurlhandler" name="Message URL Handler" introduced="7.0" purpose="optional">
+   <component id="msgurlhandler" name="Message URL Handler" introduced="7.0" purpose="optional" filter="s60>
     <unit bldFile="messagingfw/msgurlhandler/group" mrp="messagingfw/msgurlhandler/group/messaging_urlhandler.mrp"/>
    </component>
-   <component id="wappushfw" name="WAP Push Framework" introduced="6.1" purpose="optional">
+   <component id="wappushfw" name="WAP Push Framework" introduced="6.1" purpose="optional" filter="s60>
     <unit bldFile="messagingfw/wappushfw/group" mrp="messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
    </component>
-   <component id="suplsmshandler" name="SUPL SMS Handler" introduced="^2" purpose="development" class="plugin">
+   <component id="suplsmshandler" name="SUPL SMS Handler" introduced="^2" purpose="development" class="plugin" filter="s60>
     <unit bldFile="messagingfw/suplsmshandler/group" mrp="messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/>
    </component>
-   <component id="suplwappushhandler" name="SUPL WAP Push Handler" introduced="^2" purpose="optional" class="plugin">
+   <component id="suplwappushhandler" name="SUPL WAP Push Handler" introduced="^2" purpose="optional" class="plugin" filter="s60>
     <unit bldFile="messagingfw/suplwappushhandler/group" mrp="messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/>
    </component>
   </collection>