# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1284701584 -10800
# Node ID 58d624870d25e8088691893fa271da7088e525c7
# Parent  d176b53f330feae22f312bc168e1396c8322d433
Revision: 201035
Kit: 201037

diff -r d176b53f330f -r 58d624870d25 messagingfw/alwaysonline/AlwaysOnlineManager/inc/AlwaysOnlineManager.h
--- a/messagingfw/alwaysonline/AlwaysOnlineManager/inc/AlwaysOnlineManager.h	Thu Sep 02 20:55:53 2010 +0300
+++ b/messagingfw/alwaysonline/AlwaysOnlineManager/inc/AlwaysOnlineManager.h	Fri Sep 17 08:33:04 2010 +0300
@@ -248,18 +248,21 @@
         void HandleStopPluginL( const TDes8& aParameter );
 
         /**
-        * Handles stopping of plugin with given UID.
+        * Handles stopping of plugin with given implementation UID.
         * @since Series60 3.1
-        * @param aPlugin, UID of plugin
+        * @param aPluginImplementationUid, implementation UID of plugin 
+        *        (implementation_uid in .rss). 
+        *        NOTE: There can be multiple instances of same plugin 
+        *        implementation.
         */
-        void StopPluginL( const TUid& aPlugin );
+        void StopPluginL( const TUid& aPluginImplementationUid );
 
         /**
-        * Unloads the plugin with given UID and sets it as disabled.
+        * Unloads the plugin with given instance UID and sets it as disabled.
         * @since Series60 3.1
-        * @param aPlugin, UID of plugin
+        * @param aPluginInstanceUid, UID of plugin instance
         */
-        void DisablePlugin( const TUid& aPlugin );
+        void DisablePlugin( const TUid& aPluginInstanceUid );
 
         /**
         * Handles the final progress of an operation.
diff -r d176b53f330f -r 58d624870d25 messagingfw/alwaysonline/AlwaysOnlineManager/src/AlwaysOnlineManager.cpp
--- a/messagingfw/alwaysonline/AlwaysOnlineManager/src/AlwaysOnlineManager.cpp	Thu Sep 02 20:55:53 2010 +0300
+++ b/messagingfw/alwaysonline/AlwaysOnlineManager/src/AlwaysOnlineManager.cpp	Fri Sep 17 08:33:04 2010 +0300
@@ -789,7 +789,7 @@
         {
         KAOMANAGER_LOGGER_WRITE_FORMAT("CAlwaysOnlineManager::HandleOpCompletionL() : plugin: 0x%x", id);
         KAOMANAGER_LOGGER_WRITE_FORMAT("CAlwaysOnlineManager::HandleOpCompletionL() : command: %d", command);
-        KAOMANAGER_LOGGER_WRITE_FORMAT8("CAlwaysOnlineManager::HandleOpCompletionL() : result: %S", &result);
+        KAOMANAGER_LOGGER_WRITE_FORMAT("CAlwaysOnlineManager::HandleOpCompletionL() : result: %S", &result);
         
         switch ( static_cast<TManagerServerCommands>( command ) )
             {
@@ -954,32 +954,29 @@
 // CAlwaysOnlineManager::StopPluginL
 // ----------------------------------------------------------------------------
 //
-void CAlwaysOnlineManager::StopPluginL(
-    const TUid& aPlugin )
+void CAlwaysOnlineManager::StopPluginL( const TUid& aPluginImplementationUid )
     {
     KAOMANAGER_LOGGER_FN1("CAlwaysOnlineManager::StopPluginL");
     
     // Find the plugin and send stop command.
-    if ( iPluginArray->Count() )
+    for ( TInt i = 0; i < iPluginArray->Count(); i++ )
         {
-        // Get correct plugin from 
-        for ( TInt i = 0; i < iPluginArray->Count(); i++ )
-            {
-            TUid id = ( iPluginArray->At( i ) )->InstanceUid();
+        TUid id = ( iPluginArray->At( i ) )->InstanceUid();
 
-            // Is it this plugin?                
-            if ( id == aPlugin )
-                {
-                KAOMANAGER_LOGGER_WRITE_FORMAT("CAlwaysOnlineManager::StopPluginL() Calling stop to plugin: 0x%x", aPlugin);
-                TBuf8<1> dummyParam;
-                InvokeCommandHandlerL( 
-                    static_cast<TManagerServerCommands>( EAOManagerPluginStop ), 
-                    dummyParam, 
-                    i );    
-                }
+        // Stop plugin if it has matching implemention UID.
+        // Will stop all plugin instances with matching implementation.
+        if ( REComSession::GetImplementationUidL(id) == aPluginImplementationUid )
+            {
+            KAOMANAGER_LOGGER_WRITE_FORMAT(
+                "CAlwaysOnlineManager::StopPluginL() Calling stop to plugin: 0x%x", 
+                id );
+            TBuf8<1> dummyParam;
+            InvokeCommandHandlerL( 
+                static_cast<TManagerServerCommands>( EAOManagerPluginStop ), 
+                dummyParam, 
+                i );    
             }
         }
-        
     KAOMANAGER_LOGGER_FN2("CAlwaysOnlineManager::StopPluginL");
     }
 
@@ -987,35 +984,33 @@
 // CAlwaysOnlineManager::DisablePlugin
 // ----------------------------------------------------------------------------
 //
-void CAlwaysOnlineManager::DisablePlugin( const TUid& aPlugin )
+void CAlwaysOnlineManager::DisablePlugin( const TUid& aPluginInstanceUid )
     {
     KAOMANAGER_LOGGER_FN1("CAlwaysOnlineManager::DisablePlugin");
     
     // Delete the plugin and mark it disabled.
-    if ( iPluginArray->Count() )
+    for ( TInt i = 0; i < iPluginArray->Count(); i++ )
         {
-        // Get correct plugin from 
-        for ( TInt i = 0; i < iPluginArray->Count(); i++ )
+        TUid id = ( iPluginArray->At( i ) )->InstanceUid();
+        
+        // Delete plugin if it has matching instance UID.
+        if ( id == aPluginInstanceUid )
             {
-            TUid id = ( iPluginArray->At( i ) )->InstanceUid();
-            
-            // Is it this plugin?
-            if ( id == aPlugin )
-                {
-                KAOMANAGER_LOGGER_WRITE_FORMAT("CAlwaysOnlineManager::DisablePlugin() Deleting plugin from array: 0x%x", aPlugin);
-                // Delete object
-                delete iPluginArray->At( i );
-                // Delete element
-                iPluginArray->Delete( i );
-                }
+            KAOMANAGER_LOGGER_WRITE_FORMAT(
+                "CAlwaysOnlineManager::DisablePlugin() Deleting plugin from array: 0x%x", 
+                aPluginInstanceUid);
+            // Delete object
+            delete iPluginArray->At( i );
+            // Delete element
+            iPluginArray->Delete( i );
             }
-            // Set this plugin as disabled.
-            iCenRepControl->SetPluginStatus( aPlugin, ETrue );
-            
-            // Refresh the list of disabled plugins UIDs.
-            iCenRepControl->UpdateDisabledPluginsUids( 
-                *iDisabledPluginUidsArray );
         }
+    // Set this plugin as disabled.
+    iCenRepControl->SetPluginStatus( aPluginInstanceUid, ETrue );
+    
+    // Refresh the list of disabled plugins UIDs.
+    iCenRepControl->UpdateDisabledPluginsUids( *iDisabledPluginUidsArray );
+    
     
     KAOMANAGER_LOGGER_FN2("CAlwaysOnlineManager::DisablePlugin");
     }
diff -r d176b53f330f -r 58d624870d25 messagingfw/biomsgfw/BIOCSRC/BIOCMTM.CPP
--- a/messagingfw/biomsgfw/BIOCSRC/BIOCMTM.CPP	Thu Sep 02 20:55:53 2010 +0300
+++ b/messagingfw/biomsgfw/BIOCSRC/BIOCMTM.CPP	Fri Sep 17 08:33:04 2010 +0300
@@ -19,7 +19,7 @@
 
 #include <biouids.h>
 #include <f32file.h>
-#include "regpsdll.h"   // Parser Registry - used to load the parser
+#include "REGPSDLL.H"   // Parser Registry - used to load the parser
 #include <biodb.h>
 #include "BIOOP.H"
 #include <msvstd.h>
diff -r d176b53f330f -r 58d624870d25 messagingfw/biomsgfw/BIOCSRC/BIOOP.CPP
--- a/messagingfw/biomsgfw/BIOCSRC/BIOOP.CPP	Thu Sep 02 20:55:53 2010 +0300
+++ b/messagingfw/biomsgfw/BIOCSRC/BIOOP.CPP	Fri Sep 17 08:33:04 2010 +0300
@@ -42,8 +42,8 @@
 #include <txtfmlyr.h>
 
 #include "BIOSCMDS.H"
-#include "regpsdll.h"   // Parser Registry - used to load the parser
-#include "bsp.h"		// CBaseScriptParser, CBaseScriptParser2
+#include "REGPSDLL.H"   // Parser Registry - used to load the parser
+#include "BSP.H"		// CBaseScriptParser, CBaseScriptParser2
 #include "BIOOP.H"
 #ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
 #include <biomessageuids.h>
diff -r d176b53f330f -r 58d624870d25 messagingfw/biomsgfw/BIOSSRC/BIOSMTM.CPP
--- a/messagingfw/biomsgfw/BIOSSRC/BIOSMTM.CPP	Thu Sep 02 20:55:53 2010 +0300
+++ b/messagingfw/biomsgfw/BIOSSRC/BIOSMTM.CPP	Fri Sep 17 08:33:04 2010 +0300
@@ -22,8 +22,8 @@
 #include <biodb.h>	// bio database
 
 #include <biouids.h>	// contains panic codes
-#include "regpsdll.h"   // Parser Registry - used to load the parser
-#include "bsp.h"			// CBaseParser
+#include "REGPSDLL.H"   // Parser Registry - used to load the parser
+#include "BSP.H"			// CBaseParser
 
 // CRichText etc. includes
 #include <txtrich.h>
diff -r d176b53f330f -r 58d624870d25 messagingfw/biomsgfw/BIUTSRC/BSP.CPP
--- a/messagingfw/biomsgfw/BIUTSRC/BSP.CPP	Thu Sep 02 20:55:53 2010 +0300
+++ b/messagingfw/biomsgfw/BIUTSRC/BSP.CPP	Fri Sep 17 08:33:04 2010 +0300
@@ -15,7 +15,7 @@
 // 
 //
 
-#include "bsp.h"
+#include "BSP.H"
 #include "regpsdll.h"	// CRegisteredParserDll
 #include "msventry.h"	// CMsvServerEntry
 #include <msvuids.h>	// KUidMsvMessageEntry, KUidMsvServiceEntry
diff -r d176b53f330f -r 58d624870d25 messagingfw/msgsrvnstore/mtmbase/src/MTMUIBAS.CPP
--- a/messagingfw/msgsrvnstore/mtmbase/src/MTMUIBAS.CPP	Thu Sep 02 20:55:53 2010 +0300
+++ b/messagingfw/msgsrvnstore/mtmbase/src/MTMUIBAS.CPP	Fri Sep 17 08:33:04 2010 +0300
@@ -24,7 +24,7 @@
 #include <msvreg.h>
 #include <msvuids.h>
 #include <msvruids.h>
-#include "msvutils.h"
+#include "MSVUTILS.H"
 
 // Specific includes
 #include "MTMUIBAS.H"
diff -r d176b53f330f -r 58d624870d25 messagingfw/msgsrvnstore/mtmbase/src/MTUDBAS.CPP
--- a/messagingfw/msgsrvnstore/mtmbase/src/MTUDBAS.CPP	Thu Sep 02 20:55:53 2010 +0300
+++ b/messagingfw/msgsrvnstore/mtmbase/src/MTUDBAS.CPP	Fri Sep 17 08:33:04 2010 +0300
@@ -17,7 +17,7 @@
 #include <coemain.h>	// CCoeEnv
 #include <bautils.h>	// BaflUtils
 #include <fbs.h>
-#include "msvutils.h"
+#include "MSVUTILS.H"
  
 // Specific includes
 #include "MTUDCBAS.H"
diff -r d176b53f330f -r 58d624870d25 messagingfw/msgsrvnstore/server/src/CMsvBodyText.cpp
--- a/messagingfw/msgsrvnstore/server/src/CMsvBodyText.cpp	Thu Sep 02 20:55:53 2010 +0300
+++ b/messagingfw/msgsrvnstore/server/src/CMsvBodyText.cpp	Fri Sep 17 08:33:04 2010 +0300
@@ -15,7 +15,7 @@
 //
 
 #include "MSVSTORE.H"     // CMsvStore
-#include "cmsvbodytext.h"
+#include "CMsvBodyText.h"
 #include <charconv.h>     // CCnvCharacterSetConverter
 #include <txtrich.h>      // CRichText
 #include <s32mem.h>
diff -r d176b53f330f -r 58d624870d25 messagingfw/msgsrvnstore/server/src/CMsvPlainBodyText.cpp
--- a/messagingfw/msgsrvnstore/server/src/CMsvPlainBodyText.cpp	Thu Sep 02 20:55:53 2010 +0300
+++ b/messagingfw/msgsrvnstore/server/src/CMsvPlainBodyText.cpp	Fri Sep 17 08:33:04 2010 +0300
@@ -15,7 +15,7 @@
 //
 
 #include <cmsvplainbodytext.h>
-#include "cmsvbodytext.h"
+#include "CMsvBodyText.h"
 #include <mmsvstoremanager.h>
 #include "MSVPANIC.H"
 #include <txtrich.h>
diff -r d176b53f330f -r 58d624870d25 messagingfw/msgsrvnstore/server/src/MSVSTORE.CPP
--- a/messagingfw/msgsrvnstore/server/src/MSVSTORE.CPP	Thu Sep 02 20:55:53 2010 +0300
+++ b/messagingfw/msgsrvnstore/server/src/MSVSTORE.CPP	Fri Sep 17 08:33:04 2010 +0300
@@ -21,7 +21,7 @@
 #include "MSVSTORE.H"
 #include "MSVPANIC.H"
 #include "CMsvCachedStore.h"
-#include "cmsvbodytext.h"
+#include "CMsvBodyText.h"
 #include <cmsvplainbodytext.h>
 #include "CMsvAttachmentManager.h"
 #include <cmsvattachment.h>
diff -r d176b53f330f -r 58d624870d25 messagingfw/wappushfw/MiscPushMsgUtils/src/CMultipartBinIterator.cpp
--- a/messagingfw/wappushfw/MiscPushMsgUtils/src/CMultipartBinIterator.cpp	Thu Sep 02 20:55:53 2010 +0300
+++ b/messagingfw/wappushfw/MiscPushMsgUtils/src/CMultipartBinIterator.cpp	Fri Sep 17 08:33:04 2010 +0300
@@ -13,7 +13,7 @@
 // Description:
 //
     
-#include "cmultipartbiniterator.h"
+#include "CMultipartBinIterator.h"
 
 
 EXPORT_C  CMultipartBinIterator* CMultipartBinIterator::NewL(CPushMessage& aPushMessage)
diff -r d176b53f330f -r 58d624870d25 messagingfw/wappushfw/plugins/PushAppHandler/CUAAppHandler.cpp
--- a/messagingfw/wappushfw/plugins/PushAppHandler/CUAAppHandler.cpp	Thu Sep 02 20:55:53 2010 +0300
+++ b/messagingfw/wappushfw/plugins/PushAppHandler/CUAAppHandler.cpp	Fri Sep 17 08:33:04 2010 +0300
@@ -22,7 +22,7 @@
 #include <push/pushlog.h>
 #include <push/pushmessage.h>
 #include <push/pluginkiller.h>
-#include "pushdispatcher.h"
+#include "PushDispatcher.h"
 #include <push/ccontenthandlerbase.h>
 
 // Constants
diff -r d176b53f330f -r 58d624870d25 messagingfw/wappushfw/plugins/PushContentHandler/CMultiPartMixedContentHandler.cpp
--- a/messagingfw/wappushfw/plugins/PushContentHandler/CMultiPartMixedContentHandler.cpp	Thu Sep 02 20:55:53 2010 +0300
+++ b/messagingfw/wappushfw/plugins/PushContentHandler/CMultiPartMixedContentHandler.cpp	Fri Sep 17 08:33:04 2010 +0300
@@ -21,7 +21,7 @@
 
 // System includes
 #include "cmultiparttextiterator.h"
-#include "pushdispatcher.h"
+#include "PushDispatcher.h"
 
 // Constants
 _LIT(KReserved, "Reserved");
diff -r d176b53f330f -r 58d624870d25 messagingfw/wappushfw/plugins/PushContentHandler/CMultiPartMixedContentHandler.h
--- a/messagingfw/wappushfw/plugins/PushContentHandler/CMultiPartMixedContentHandler.h	Thu Sep 02 20:55:53 2010 +0300
+++ b/messagingfw/wappushfw/plugins/PushContentHandler/CMultiPartMixedContentHandler.h	Fri Sep 17 08:33:04 2010 +0300
@@ -21,7 +21,7 @@
 #include <e32base.h>
 #include "cmultipartiteratorbase.h"
 #include <push/ccontenthandlerbase.h>
-#include "cmultipartbiniterator.h"
+#include "CMultipartBinIterator.h"
 #include <push/pushmessage.h>
 
 // Local includes
diff -r d176b53f330f -r 58d624870d25 messagingfw/wappushfw/plugins/PushContentHandler/CMultiPartRelAndAltContentHandler.h
--- a/messagingfw/wappushfw/plugins/PushContentHandler/CMultiPartRelAndAltContentHandler.h	Thu Sep 02 20:55:53 2010 +0300
+++ b/messagingfw/wappushfw/plugins/PushContentHandler/CMultiPartRelAndAltContentHandler.h	Fri Sep 17 08:33:04 2010 +0300
@@ -21,7 +21,7 @@
 #include <e32base.h>
 #include <push/pushmessage.h>
 #include <push/ccontenthandlerbase.h>
-#include "cmultipartbiniterator.h"
+#include "CMultipartBinIterator.h"
 
 // Local includes
 //
diff -r d176b53f330f -r 58d624870d25 messagingfw/wappushfw/plugins/ROAppHandler/src/CROAppHandler.cpp
--- a/messagingfw/wappushfw/plugins/ROAppHandler/src/CROAppHandler.cpp	Thu Sep 02 20:55:53 2010 +0300
+++ b/messagingfw/wappushfw/plugins/ROAppHandler/src/CROAppHandler.cpp	Fri Sep 17 08:33:04 2010 +0300
@@ -23,7 +23,7 @@
 #include <push/pushlog.h>
 #include <push/pushmessage.h>
 #include <push/pluginkiller.h>
-#include "pushdispatcher.h"
+#include "PushDispatcher.h"
 #include <push/ccontenthandlerbase.h>
 
 
diff -r d176b53f330f -r 58d624870d25 messagingfw/wappushfw/pushutils/src/PushDispatcher.cpp
--- a/messagingfw/wappushfw/pushutils/src/PushDispatcher.cpp	Thu Sep 02 20:55:53 2010 +0300
+++ b/messagingfw/wappushfw/pushutils/src/PushDispatcher.cpp	Fri Sep 17 08:33:04 2010 +0300
@@ -17,7 +17,7 @@
 
 // System includes
 //
-#include "pushdispatcher.h"
+#include "PushDispatcher.h"
 #include <push/pluginkiller.h>
 #include <push/cpushhandlerbase.h>
 #include <push/ccontenthandlerbase.h>
diff -r d176b53f330f -r 58d624870d25 messagingfw/wappushfw/pushutils/src/PushMessage.cpp
--- a/messagingfw/wappushfw/pushutils/src/PushMessage.cpp	Thu Sep 02 20:55:53 2010 +0300
+++ b/messagingfw/wappushfw/pushutils/src/PushMessage.cpp	Fri Sep 17 08:33:04 2010 +0300
@@ -15,7 +15,7 @@
     
 // System Include
 #include <push/pushmessage.h>
-#include "wapdecoder.h"
+#include "WapDecoder.h"
 
 // User Include
 #include "chttpresponse.h"
diff -r d176b53f330f -r 58d624870d25 messagingfw/wappushfw/pushutils/src/WapDecoder.cpp
--- a/messagingfw/wappushfw/pushutils/src/WapDecoder.cpp	Thu Sep 02 20:55:53 2010 +0300
+++ b/messagingfw/wappushfw/pushutils/src/WapDecoder.cpp	Fri Sep 17 08:33:04 2010 +0300
@@ -13,7 +13,7 @@
 // Description:
 //
 
-#include "wapdecoder.h"
+#include "WapDecoder.h"
 
 const TInt KMaxLongIntSize = 0x1E;	// Long-integer can have maximum 30 OCTETS (WSP Spec)
 
diff -r d176b53f330f -r 58d624870d25 messagingfw/wappushfw/pushwatcher/src/CLWatcher.cpp
--- a/messagingfw/wappushfw/pushwatcher/src/CLWatcher.cpp	Thu Sep 02 20:55:53 2010 +0300
+++ b/messagingfw/wappushfw/pushwatcher/src/CLWatcher.cpp	Fri Sep 17 08:33:04 2010 +0300
@@ -18,7 +18,7 @@
 #include <wapmsgerr.h>
 #include "CLWatcher.h"
 #include <push/pushmessage.h>
-#include "pushdispatcher.h"
+#include "PushDispatcher.h"
 #include <push/cpushhandlerbase.h>
 #include <ecom/ecom.h>
 
diff -r d176b53f330f -r 58d624870d25 messagingfw/watcherfw/group/watcher.mmp
--- a/messagingfw/watcherfw/group/watcher.mmp	Thu Sep 02 20:55:53 2010 +0300
+++ b/messagingfw/watcherfw/group/watcher.mmp	Fri Sep 17 08:33:04 2010 +0300
@@ -50,7 +50,7 @@
 LIBRARY flogger.lib
 #endif
 
-DEFFILE		V2_watcher.DEF
+DEFFILE		v2_watcher.DEF
 
 VENDORID 0x70000001
 
diff -r d176b53f330f -r 58d624870d25 package_definition.xml
--- a/package_definition.xml	Thu Sep 02 20:55:53 2010 +0300
+++ b/package_definition.xml	Fri Sep 17 08:33:04 2010 +0300
@@ -1,83 +1,96 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="messagingmw" name="Messaging Middleware" levels="stack fw api">
-    <collection id="msgbranched" name="Messaging Branched" level="fw">
-      <component id="msgbranched_build" filter="s60" name="Messaging Branched Build">
-        <unit bldFile="msgbranched/group"/>
-      </component>
-    </collection>
-    <collection id="messagingfw" name="Messaging Framework" level="fw">
-      <component id="alwaysonline" filter="s60" name="Always Online Server" introduced="^2">
-        <!-- <unit bldFile="messagingfw/alwaysonline/alwaysonlinemanager/group"/> -->
-        <!-- <unit bldFile="messagingfw/alwaysonline/alwaysonlinestarterapp/group"/> -->
-        <unit bldFile="messagingfw/alwaysonline/group"/>
-      </component>
-      <component id="msgcommonutils" filter="s60" name="Messaging Common Utils" introduced="^2">
-        <unit bldFile="messagingfw/msgcommonutils/group"/>
-      </component>
-      <component id="senduiservices" filter="s60" name="Send UI Services" introduced="^2">
-        <unit bldFile="messagingfw/senduiservices/group"/>
-        <!-- <unit bldFile="messagingfw/senduiservices/datautils/group"/> -->
-        <!-- <unit bldFile="messagingfw/senduiservices/launcher/group"/> -->
-        <!-- <unit bldFile="messagingfw/senduiservices/serviceresolver/group"/> -->
-        <!-- <unit bldFile="messagingfw/senduiservices/watcher/group"/> -->
-      </component>
-      <component id="scheduledsendmtm" name="Scheduled Send MTM" introduced="6.0" purpose="optional" class="plugin">
-        <unit bldFile="messagingfw/scheduledsendmtm/group" mrp="messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
-      </component>
-      <component id="msgsrvnstore" name="Message Server and Store" purpose="optional">
-        <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">
-        <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">
-        <unit bldFile="messagingfw/msgconf/group" mrp="messagingfw/msgconf/group/messaging_config.mrp"/>
-      </component>
-      <component id="watcherfw" name="Watcher Framework" purpose="optional">
-        <unit bldFile="messagingfw/watcherfw/group" mrp="messagingfw/watcherfw/group/messaging_watcher.mrp"/>
-      </component>
-      <component id="msgtest" name="Messaging Test" purpose="development">
-        <unit bldFile="messagingfw/msgtest/group" mrp="messagingfw/msgtest/group/messaging_test.mrp"/>
-      </component>
-      <component id="msgtests" name="Messaging Tests" purpose="development" filter="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">
-        <unit mrp="messagingfw/msgtestfw/group/messaging_testframework.mrp" bldFile="messagingfw/msgtestfw/group"/>
-      </component>
-      <component id="msgtestproduct" name="Messaging Test Product" purpose="development" filter="test">
-        <unit mrp="messagingfw/msgtestproduct/group/messaging_testproduct.mrp" bldFile="messagingfw/msgtestproduct/group"/>
-      </component>
-      <component id="sendas" name="Send As" purpose="optional">
-        <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">
-        <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">
-        <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">
-        <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">
-        <unit bldFile="messagingfw/suplwappushhandler/group" mrp="messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/>
-      </component>
-    </collection>
-    <collection id="messagingmw_info" name="Messaging Middleware Info" level="api">
-      <component id="msgfw_pub" filter="s60" name="Messaging Middleware Public Interfaces" class="api">
-        <unit bldFile="msgfw_pub/group"/>
-        <!-- <unit bldFile="msgfw_pub/send_ui_api/tsrc/bc/group"/> -->
-        <unit bldFile="msgfw_pub/send_ui_api/tsrc/group"/>
-      </component>
-      <component id="msgfw_plat" filter="s60" name="Messaging Middleware Platform Interfaces" class="api">
-        <unit bldFile="msgfw_plat/group"/>
-        <unit bldFile="msgfw_plat/send_ui_plugin_api/tsrc/group"/>
-      </component>
-      <component id="messagingmw_metadata" name="Messaging Middleware Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-        <unit mrp="messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
-      </component>
-    </collection>
-  </package>
+ <package id="messagingmw" name="Messaging Middleware" levels="stack support fw api">
+  <collection id="msgfw_plat" name="Messaging Middleware Platform Interfaces" level="api">
+   <component id="always_online_plugin_api" name="Always Online Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="msgfw_plat/always_online_plugin_api/always_online_plugin_api.metaxml"/>
+    <unit bldFile="msgfw_plat/always_online_plugin_api/group"/>
+   </component>
+   <component id="always_online_client_api" name="Always Online Client API" class="api" filter="s60">
+    <meta rel="Api" href="msgfw_plat/always_online_client_api/always_online_client_api.metaxml"/>
+    <unit bldFile="msgfw_plat/always_online_client_api/group"/>
+   </component>
+   <component id="msg_common_utils_api" name="Messaging Common Utils API" class="api" filter="s60">
+    <meta rel="Api" href="msgfw_plat/msg_common_utils_api/msg_common_utils_api.metaxml"/>
+    <unit bldFile="msgfw_plat/msg_common_utils_api/group"/>
+   </component>
+   <component id="muiu_utils_api" name="Messaging Center UI Utilities API" class="api" filter="s60" introduced="^4">
+      <unit bldFile="msgfw_plat/muiu_utils_api/group"/>
+   </component>
+  </collection>
+  <collection id="messagingfw" name="Messaging Framework" level="fw">
+   <!-- should break this collection up into smaller related collections -->
+   <component id="send_ui_api" name="Send UI API" class="api" filter="s60" deprecated="^4">
+    <meta rel="Api" href="messagingfw/deprecate/send_ui_api/send_ui_api.metaxml"/>
+    <unit bldFile="messagingfw/deprecate/send_ui_api/group"/>
+   </component>
+   <component id="send_ui_plugin_api" name="Send UI Plug-in API" class="api" filter="s60" deprecated="^4">
+    <meta rel="Api" href="messagingfw/deprecate/send_ui_plugin_api/send_ui_plugin_api.metaxml"/>
+    <unit bldFile="messagingfw/deprecate/send_ui_plugin_api/group"/>
+   </component>
+   <component id="send_ui_datautils_api" name="Send UI Data Utils API" class="api" filter="s60" deprecated="^4">
+    <meta rel="Api" href="messagingfw/deprecate/send_ui_datautils_api/send_ui_datautils_api.metaxml"/>
+    <unit bldFile="messagingfw/deprecate/send_ui_datautils_api/group"/>
+   </component>
+   <component id="alwaysonline" filter="s60" name="Always Online Server" introduced="^2">
+    <unit bldFile="messagingfw/alwaysonline/group"/>
+   </component>
+   <component id="msgcommonutils" filter="s60" name="Messaging Common Utils" introduced="^2">
+    <unit bldFile="messagingfw/msgcommonutils/group"/>
+   </component>
+   <component id="senduiservices" filter="s60" name="Send UI Services" introduced="^2" deprecated="^4">
+    <unit bldFile="messagingfw/deprecate/senduiservices/group"/>
+   </component>
+   <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">
+    <unit bldFile="messagingfw/scheduledsendmtm/group" mrp="messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
+   </component>
+   <component id="msgsrvnstore" name="Message Server and Store" purpose="optional">
+    <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">
+    <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">
+    <unit bldFile="messagingfw/msgconf/group" mrp="messagingfw/msgconf/group/messaging_config.mrp"/>
+   </component>
+   <component id="watcherfw" name="Watcher Framework" purpose="optional">
+    <unit bldFile="messagingfw/watcherfw/group" mrp="messagingfw/watcherfw/group/messaging_watcher.mrp"/>
+   </component>
+   <component id="msgtest" name="Messaging Test" purpose="development">
+    <unit bldFile="messagingfw/msgtest/group" mrp="messagingfw/msgtest/group/messaging_test.mrp"/>
+   </component>
+   <component id="msgtests" name="Messaging Tests" purpose="development" filter="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">
+    <unit mrp="messagingfw/msgtestfw/group/messaging_testframework.mrp" bldFile="messagingfw/msgtestfw/group"/>
+   </component>
+   <component id="msgtestproduct" name="Messaging Test Product" purpose="development" filter="test">
+    <unit mrp="messagingfw/msgtestproduct/group/messaging_testproduct.mrp" bldFile="messagingfw/msgtestproduct/group"/>
+   </component>
+   <component id="sendas" name="Send As" purpose="optional">
+    <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">
+    <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">
+    <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">
+    <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">
+    <unit bldFile="messagingfw/suplwappushhandler/group" mrp="messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/>
+   </component>
+  </collection>
+  <collection id="messagingmw_info" name="Messaging Middleware Info" level="api">
+   <component id="messagingmw_metadata" name="Messaging Middleware Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+    <unit mrp="messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
diff -r d176b53f330f -r 58d624870d25 package_map.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/package_map.xml	Fri Sep 17 08:33:04 2010 +0300
@@ -0,0 +1,1 @@
+<PackageMap root="sf" layer="mw"/>