201035
authorhgs
Fri, 03 Sep 2010 17:34:04 +0530
changeset 54 13ecdfc9a581
parent 50 00439341df81
child 55 e1220a4391cb
201035
connectivitymodules/SeCon/catalogspcconnectivityplugin/group/catalogspcconnectivityplugin.mmp
connectivitymodules/SeCon/clients/pcconn/bld/sconpcconnclient.mmp
connectivitymodules/SeCon/clients/syncclient/group/sconsyncclient.mmp
connectivitymodules/SeCon/cntparser/bld/cntparsersrv.mmp
connectivitymodules/SeCon/cntparser/bld/cntparsersrvexe.mmp
connectivitymodules/SeCon/plugins/ftp/bld/sconftpplugin.mmp
connectivitymodules/SeCon/plugins/hapticsconnplugin/group/hapticsconnplugin.mmp
connectivitymodules/SeCon/plugins/pcconn/bld/sconpcconnplugin.mmp
connectivitymodules/SeCon/servers/pcconn/bld/sconpcconnserver.mmp
connectivitymodules/SeCon/servers/syncserver/group/sconsyncserver.mmp
connectivitymodules/SeCon/services/csc/bld/sconcsc.mmp
connectivitymodules/SeCon/services/ftp/bld/sconftp.mmp
connectivitymodules/SeCon/services/oviaccounthandler/group/sconoviaccounthandler.mmp
connectivitymodules/SeCon/services/pcd/bld/sconpcd.mmp
connectivitymodules/SeCon/wbxml/conmlhandler/bld/sconconmlhandler.mmp
contentctrl_plat/ds_data_modification_api/tsrc/mt_cnsmldatamodbase/mt_cnsmldatamodbase.mmp
dsdcmoadapter/group/nsmldsctrldcmoadapter.mmp
omads/omadsextensions/adapters/agenda/bld/nsmlagendadataprovider.mmp
omads/omadsextensions/adapters/agenda/src/nsmlagendadatastore.cpp
omads/omadsextensions/adapters/bookmark/group/bookmarkdataprovider.mmp
omads/omadsextensions/adapters/contacts/bld/nsmldscontactsdataprovider.mmp
omads/omadsextensions/adapters/contactsgroup/group/contactsgrpdataprovider.mmp
omads/omadsextensions/adapters/mediads/group/mediads.mmp
omads/omadsextensions/adapters/mms/group/mmsdataprovider.mmp
omads/omadsextensions/adapters/notes/group/nsmldsnotepaddataprovider.mmp
omads/omadsextensions/adapters/notes/src/NSmlNotepadDataStore.cpp
omads/omadsextensions/adapters/notes/src/nsmlnotepadDatabase.cpp
omads/omadsextensions/adapters/sms/group/smsdataprovider.mmp
omads/omadsextensions/datamod/bld/nsmldatamod.mmp
omads/omadsextensions/datamod/src/nsmldatamodbase.cpp
omads/omadsextensions/dsutils/cgiscriptutils/bld/nsmlCGIScriptParser.mmp
omads/omadsextensions/dsutils/contactsdatastoreextension/contactsdatastoreextension.pro
package_definition.xml
package_map.xml
--- a/connectivitymodules/SeCon/catalogspcconnectivityplugin/group/catalogspcconnectivityplugin.mmp	Fri Aug 20 09:35:25 2010 +0530
+++ b/connectivitymodules/SeCon/catalogspcconnectivityplugin/group/catalogspcconnectivityplugin.mmp	Fri Sep 03 17:34:04 2010 +0530
@@ -37,3 +37,6 @@
 
 LIBRARY                 euser.lib
 LIBRARY                 apmime.lib
+
+
+SMPSAFE
--- a/connectivitymodules/SeCon/clients/pcconn/bld/sconpcconnclient.mmp	Fri Aug 20 09:35:25 2010 +0530
+++ b/connectivitymodules/SeCon/clients/pcconn/bld/sconpcconnclient.mmp	Fri Sep 03 17:34:04 2010 +0530
@@ -60,3 +60,6 @@
 LIBRARY         estor.lib   // RMemWriteStream
 LIBRARY         efsrv.lib   // Rfs, RFile
 DEBUGLIBRARY    flogger.lib
+
+
+SMPSAFE
--- a/connectivitymodules/SeCon/clients/syncclient/group/sconsyncclient.mmp	Fri Aug 20 09:35:25 2010 +0530
+++ b/connectivitymodules/SeCon/clients/syncclient/group/sconsyncclient.mmp	Fri Sep 03 17:34:04 2010 +0530
@@ -48,3 +48,6 @@
 LIBRARY         charconv.lib
 LIBRARY         smlstoreformat.lib
 DEBUGLIBRARY    flogger.lib
+
+
+SMPSAFE
--- a/connectivitymodules/SeCon/cntparser/bld/cntparsersrv.mmp	Fri Aug 20 09:35:25 2010 +0530
+++ b/connectivitymodules/SeCon/cntparser/bld/cntparsersrv.mmp	Fri Sep 03 17:34:04 2010 +0530
@@ -58,3 +58,6 @@
 LIBRARY         bafl.lib
 DEBUGLIBRARY    flogger.lib
 
+
+
+SMPSAFE
--- a/connectivitymodules/SeCon/cntparser/bld/cntparsersrvexe.mmp	Fri Aug 20 09:35:25 2010 +0530
+++ b/connectivitymodules/SeCon/cntparser/bld/cntparsersrvexe.mmp	Fri Sep 03 17:34:04 2010 +0530
@@ -48,3 +48,6 @@
 LIBRARY	        vcard.lib
 LIBRARY         bafl.lib
 DEBUGLIBRARY    flogger.lib
+
+
+SMPSAFE
--- a/connectivitymodules/SeCon/plugins/ftp/bld/sconftpplugin.mmp	Fri Aug 20 09:35:25 2010 +0530
+++ b/connectivitymodules/SeCon/plugins/ftp/bld/sconftpplugin.mmp	Fri Sep 03 17:34:04 2010 +0530
@@ -55,3 +55,6 @@
 LIBRARY	        efsrv.lib 
 LIBRARY         bluetooth.lib
 LIBRARY         esock.lib 
+
+
+SMPSAFE
--- a/connectivitymodules/SeCon/plugins/hapticsconnplugin/group/hapticsconnplugin.mmp	Fri Aug 20 09:35:25 2010 +0530
+++ b/connectivitymodules/SeCon/plugins/hapticsconnplugin/group/hapticsconnplugin.mmp	Fri Sep 03 17:34:04 2010 +0530
@@ -56,3 +56,6 @@
 LIBRARY         platformenv.lib
 LIBRARY         irobex.lib
 LIBRARY         hwrmhapticspacketizer.lib
+
+
+SMPSAFE
--- a/connectivitymodules/SeCon/plugins/pcconn/bld/sconpcconnplugin.mmp	Fri Aug 20 09:35:25 2010 +0530
+++ b/connectivitymodules/SeCon/plugins/pcconn/bld/sconpcconnplugin.mmp	Fri Sep 03 17:34:04 2010 +0530
@@ -61,3 +61,6 @@
 LIBRARY         apmime.lib 
 LIBRARY         bluetooth.lib
 LIBRARY         esock.lib 
+
+
+SMPSAFE
--- a/connectivitymodules/SeCon/servers/pcconn/bld/sconpcconnserver.mmp	Fri Aug 20 09:35:25 2010 +0530
+++ b/connectivitymodules/SeCon/servers/pcconn/bld/sconpcconnserver.mmp	Fri Sep 03 17:34:04 2010 +0530
@@ -76,3 +76,6 @@
 LIBRARY         btengsettings.lib
 DEBUGLIBRARY    flogger.lib
 
+
+
+SMPSAFE
--- a/connectivitymodules/SeCon/servers/syncserver/group/sconsyncserver.mmp	Fri Aug 20 09:35:25 2010 +0530
+++ b/connectivitymodules/SeCon/servers/syncserver/group/sconsyncserver.mmp	Fri Sep 03 17:34:04 2010 +0530
@@ -59,3 +59,6 @@
 LIBRARY         nsmlchangefinder.lib
 LIBRARY         smlstoreformat.lib
 LIBRARY         charconv.lib
+
+
+SMPSAFE
--- a/connectivitymodules/SeCon/services/csc/bld/sconcsc.mmp	Fri Aug 20 09:35:25 2010 +0530
+++ b/connectivitymodules/SeCon/services/csc/bld/sconcsc.mmp	Fri Sep 03 17:34:04 2010 +0530
@@ -75,3 +75,6 @@
 LIBRARY         sysversioninfo.lib
 LIBRARY         etel3rdparty.lib
 LIBRARY         platformver.lib
+
+
+SMPSAFE
--- a/connectivitymodules/SeCon/services/ftp/bld/sconftp.mmp	Fri Aug 20 09:35:25 2010 +0530
+++ b/connectivitymodules/SeCon/services/ftp/bld/sconftp.mmp	Fri Sep 03 17:34:04 2010 +0530
@@ -72,3 +72,6 @@
 LIBRARY         sysutil.lib
 LIBRARY         centralrepository.lib
 DEBUGLIBRARY    flogger.lib             // For debug logging
+
+
+SMPSAFE
--- a/connectivitymodules/SeCon/services/oviaccounthandler/group/sconoviaccounthandler.mmp	Fri Aug 20 09:35:25 2010 +0530
+++ b/connectivitymodules/SeCon/services/oviaccounthandler/group/sconoviaccounthandler.mmp	Fri Sep 03 17:34:04 2010 +0530
@@ -45,3 +45,6 @@
 LIBRARY         euser.lib
 LIBRARY         wsaccountmanager.lib
 LIBRARY         estor.lib // For RWriteStream
+
+
+SMPSAFE
--- a/connectivitymodules/SeCon/services/pcd/bld/sconpcd.mmp	Fri Aug 20 09:35:25 2010 +0530
+++ b/connectivitymodules/SeCon/services/pcd/bld/sconpcd.mmp	Fri Sep 03 17:34:04 2010 +0530
@@ -95,3 +95,6 @@
 LIBRARY         sif.lib
 DEBUGLIBRARY    flogger.lib
 // End of file
+
+
+SMPSAFE
--- a/connectivitymodules/SeCon/wbxml/conmlhandler/bld/sconconmlhandler.mmp	Fri Aug 20 09:35:25 2010 +0530
+++ b/connectivitymodules/SeCon/wbxml/conmlhandler/bld/sconconmlhandler.mmp	Fri Sep 03 17:34:04 2010 +0530
@@ -54,3 +54,6 @@
 LIBRARY         euser.lib
 LIBRARY         estor.lib
 DEBUGLIBRARY    flogger.lib
+
+
+SMPSAFE
--- a/contentctrl_plat/ds_data_modification_api/tsrc/mt_cnsmldatamodbase/mt_cnsmldatamodbase.mmp	Fri Aug 20 09:35:25 2010 +0530
+++ b/contentctrl_plat/ds_data_modification_api/tsrc/mt_cnsmldatamodbase/mt_cnsmldatamodbase.mmp	Fri Sep 03 17:34:04 2010 +0530
@@ -65,3 +65,6 @@
 LIBRARY         nsmldatamod.lib
 LIBRARY         smlstoreformat.lib
 LIBRARY         bafl.lib
+
+
+SMPSAFE
--- a/dsdcmoadapter/group/nsmldsctrldcmoadapter.mmp	Fri Aug 20 09:35:25 2010 +0530
+++ b/dsdcmoadapter/group/nsmldsctrldcmoadapter.mmp	Fri Sep 03 17:34:04 2010 +0530
@@ -48,4 +48,6 @@
 LIBRARY 				euser.lib ECom.lib efsrv.lib 
 LIBRARY         centralrepository.lib
 LIBRARY					commonengine.lib  
-LIBRARY       hbcore.lib hbwidgets.lib
\ No newline at end of file
+LIBRARY       hbcore.lib hbwidgets.lib
+
+SMPSAFE
--- a/omads/omadsextensions/adapters/agenda/bld/nsmlagendadataprovider.mmp	Fri Aug 20 09:35:25 2010 +0530
+++ b/omads/omadsextensions/adapters/agenda/bld/nsmlagendadataprovider.mmp	Fri Sep 03 17:34:04 2010 +0530
@@ -68,3 +68,6 @@
 LIBRARY		nsmlchangefinder.lib wbxmllib.lib bafl.lib sysutil.lib
 LIBRARY		CalInterimAPI.lib msgs.lib CalenImp.lib CalenInterimUtils2.lib
 LIBRARY 	versit.lib
+
+
+SMPSAFE
--- a/omads/omadsextensions/adapters/agenda/src/nsmlagendadatastore.cpp	Fri Aug 20 09:35:25 2010 +0530
+++ b/omads/omadsextensions/adapters/agenda/src/nsmlagendadatastore.cpp	Fri Sep 03 17:34:04 2010 +0530
@@ -1395,6 +1395,16 @@
 		           Multiple items are not supported: END");
         User::Leave( KErrNotSupported );
 	    }
+		
+	// Check the validity of the calentry	
+	CCalEntry* arrayentry = rdArray[0];
+	if ( !arrayentry ) 
+		{
+		CleanupStack::PopAndDestroy( 2 ); // rdArray, readStream
+		_DBG_FILE("CNSmlAgendaDataStore::DoCommitCreateItemL - \
+		           Invalid Calentry: END");
+		User::Leave( KErrGeneral );
+		}		
 	    
     TInt err( KErrNone );
 
@@ -1595,6 +1605,16 @@
 		           Multiple items are not supported: END");
         User::Leave( KErrNotSupported );
 	    }
+		
+	// Check the validity of the calentry	
+	CCalEntry* arrayentry = rdArray[0];
+	if ( !arrayentry ) 
+		{
+		CleanupStack::PopAndDestroy( 2 ); // rdArray, readStream
+		_DBG_FILE("CNSmlAgendaDataStore::DoCommitCreateItemL - \
+		           Invalid Calentry: END");
+		User::Leave( KErrGeneral );
+		}
 	    
 	TInt err( KErrNone );
 
--- a/omads/omadsextensions/adapters/bookmark/group/bookmarkdataprovider.mmp	Fri Aug 20 09:35:25 2010 +0530
+++ b/omads/omadsextensions/adapters/bookmark/group/bookmarkdataprovider.mmp	Fri Sep 03 17:34:04 2010 +0530
@@ -73,4 +73,6 @@
 LIBRARY         sysutil.lib
 LIBRARY         commonengine.lib        // For resource reader
 LIBRARY         FeedsServerClient.lib
-LIBRARY         hash.lib
\ No newline at end of file
+LIBRARY         hash.lib
+
+SMPSAFE
--- a/omads/omadsextensions/adapters/contacts/bld/nsmldscontactsdataprovider.mmp	Fri Aug 20 09:35:25 2010 +0530
+++ b/omads/omadsextensions/adapters/contacts/bld/nsmldscontactsdataprovider.mmp	Fri Sep 03 17:34:04 2010 +0530
@@ -70,3 +70,6 @@
 LIBRARY		nsmldshostclient.lib
 LIBRARY		nsmlcontactsdatastoreextension.lib
 
+
+
+SMPSAFE
--- a/omads/omadsextensions/adapters/contactsgroup/group/contactsgrpdataprovider.mmp	Fri Aug 20 09:35:25 2010 +0530
+++ b/omads/omadsextensions/adapters/contactsgroup/group/contactsgrpdataprovider.mmp	Fri Sep 03 17:34:04 2010 +0530
@@ -69,3 +69,6 @@
 LIBRARY         cntmodel.lib
 LIBRARY         vcard.lib
 LIBRARY         versit.lib
+
+
+SMPSAFE
--- a/omads/omadsextensions/adapters/mediads/group/mediads.mmp	Fri Aug 20 09:35:25 2010 +0530
+++ b/omads/omadsextensions/adapters/mediads/group/mediads.mmp	Fri Sep 03 17:34:04 2010 +0530
@@ -76,3 +76,6 @@
 LIBRARY         platformenv.lib
 LIBRARY         mdccommon.lib
 LIBRARY         mdeclient.lib
+
+
+SMPSAFE
--- a/omads/omadsextensions/adapters/mms/group/mmsdataprovider.mmp	Fri Aug 20 09:35:25 2010 +0530
+++ b/omads/omadsextensions/adapters/mms/group/mmsdataprovider.mmp	Fri Sep 03 17:34:04 2010 +0530
@@ -66,3 +66,6 @@
 LIBRARY         nsmlchangefinder.lib
 LIBRARY         SenXml.lib 
 LIBRARY         charconv.lib 
+
+
+SMPSAFE
--- a/omads/omadsextensions/adapters/notes/group/nsmldsnotepaddataprovider.mmp	Fri Aug 20 09:35:25 2010 +0530
+++ b/omads/omadsextensions/adapters/notes/group/nsmldsnotepaddataprovider.mmp	Fri Sep 03 17:34:04 2010 +0530
@@ -68,3 +68,6 @@
 LIBRARY		calinterimapi.lib caleninterimutils2.lib
 LIBRARY		nsmldebug.lib
 
+
+
+SMPSAFE
--- a/omads/omadsextensions/adapters/notes/src/NSmlNotepadDataStore.cpp	Fri Aug 20 09:35:25 2010 +0530
+++ b/omads/omadsextensions/adapters/notes/src/NSmlNotepadDataStore.cpp	Fri Sep 03 17:34:04 2010 +0530
@@ -698,24 +698,24 @@
 	{
 	_NOTEPAD_DBG_FILE("CNSmlNotepadDataStore::DoWriteItemL(): begin");
 	if ( iState == ENSmlItemCreating || iState == ENSmlItemUpdating )
-		{
-		TInt totalSize = aData.Size() + iItemData->Size();
-		if( SysUtil::DiskSpaceBelowCriticalLevelL( &iRfs, totalSize, iDrive ) )
-			{
-			User::RequestComplete(iCallerStatus, KErrDiskFull);
-			return;
-			}
+	{
 		if ( iItemData )
-			{
-			if ( iWriterPosition  == -1 )
-				{
+		{
+		    TInt totalSize = aData.Size() + iItemData->Size();
+		    if( SysUtil::DiskSpaceBelowCriticalLevelL( &iRfs, totalSize, iDrive ) )
+		  	  {
+			   User::RequestComplete(iCallerStatus, KErrDiskFull);
+			   return;
+			  }
+		    if ( iWriterPosition  == -1 )
+			  {
 				User::Leave( KErrEof );
-				}
-			iItemData->InsertL( iWriterPosition , aData );
-			iWriterPosition  = aData.Size();
-			return;
-			}
+			  }
+			 iItemData->InsertL( iWriterPosition , aData );
+			 iWriterPosition  = aData.Size();
+		   return;			
 		}
+	}
 	User::Leave( KErrNotReady );
 	_NOTEPAD_DBG_FILE("CNSmlNotepadDataStore::DoWriteItemL(): end");
 	}
--- a/omads/omadsextensions/adapters/notes/src/nsmlnotepadDatabase.cpp	Fri Aug 20 09:35:25 2010 +0530
+++ b/omads/omadsextensions/adapters/notes/src/nsmlnotepadDatabase.cpp	Fri Sep 03 17:34:04 2010 +0530
@@ -245,11 +245,6 @@
             //CleanupStack::Pop(aItem);
             CleanupStack::PopAndDestroy(entryTobeFetched);
             }
-        else
-            {
-            delete entryTobeFetched;
-            entryTobeFetched = NULL;
-            }
         }   
     
     _NOTEPAD_DBG_FILE("CNSmlNotepadDatabase::GetNoteL(): end");
--- a/omads/omadsextensions/adapters/sms/group/smsdataprovider.mmp	Fri Aug 20 09:35:25 2010 +0530
+++ b/omads/omadsextensions/adapters/sms/group/smsdataprovider.mmp	Fri Sep 03 17:34:04 2010 +0530
@@ -72,3 +72,6 @@
 LIBRARY         cntmodel.lib 
 LIBRARY         SenXml.lib 
 LIBRARY         charconv.lib 
+
+
+SMPSAFE
--- a/omads/omadsextensions/datamod/bld/nsmldatamod.mmp	Fri Aug 20 09:35:25 2010 +0530
+++ b/omads/omadsextensions/datamod/bld/nsmldatamod.mmp	Fri Sep 03 17:34:04 2010 +0530
@@ -47,3 +47,6 @@
 LIBRARY			bafl.lib
 LIBRARY			smlstoreformat.lib
 LIBRARY			nsmldebug.lib
+
+
+SMPSAFE
--- a/omads/omadsextensions/datamod/src/nsmldatamodbase.cpp	Fri Aug 20 09:35:25 2010 +0530
+++ b/omads/omadsextensions/datamod/src/nsmldatamodbase.cpp	Fri Sep 03 17:34:04 2010 +0530
@@ -112,7 +112,7 @@
 EXPORT_C void CNSmlDataModBase::StripTxL( CBufBase& aItem )
 	{
 	_DBG_FILE("CNSmlDataModBase::StripTxL(): begin");
-	HBufC8* buf = HBufC8::NewLC(aItem.Size() * 2);
+	HBufC8* buf = HBufC8::NewLC(aItem.Size());
 	*buf = aItem.Ptr(0);
 	TPtr8 ptrBuf = buf->Des();
 
@@ -285,7 +285,7 @@
         for( TInt i = 0; i < allProps->Count(); ) // Variable i is not increased here because size of count might be changes during loop
             {
             const CParserProperty& ownProperty = *allProps->At( i );
-            CParserPropertyValue* ownValue = ownProperty.Value();
+           
 
             TBool removeMe( EFalse );
             
@@ -458,8 +458,7 @@
         for( TInt i = 0; i < allProps->Count(); ) // Variable i is not increased here because size of count might be changes during loop
             {
             const CParserProperty& ownProperty = *allProps->At( i );
-            CParserPropertyValue* ownValue = ownProperty.Value();
-
+             
             TBool removeMe( ETrue );
             
             for( TInt i2 = 0; i2 < iRemoteStoreFormat->MimeFormat( iUsedRemoteMimeType ).PropertyCount(); i2++ )
--- a/omads/omadsextensions/dsutils/cgiscriptutils/bld/nsmlCGIScriptParser.mmp	Fri Aug 20 09:35:25 2010 +0530
+++ b/omads/omadsextensions/dsutils/cgiscriptutils/bld/nsmlCGIScriptParser.mmp	Fri Sep 03 17:34:04 2010 +0530
@@ -47,3 +47,6 @@
 
 LIBRARY         euser.lib InetProtUtil.lib
 
+
+
+SMPSAFE
--- a/omads/omadsextensions/dsutils/contactsdatastoreextension/contactsdatastoreextension.pro	Fri Aug 20 09:35:25 2010 +0530
+++ b/omads/omadsextensions/dsutils/contactsdatastoreextension/contactsdatastoreextension.pro	Fri Sep 03 17:34:04 2010 +0530
@@ -58,4 +58,6 @@
 	TARGET.EPOCHEAPSIZE = "0x020000 0x800000"
 	TARGET.EPOCALLOWDLLDATA = 1
     TARGET.CAPABILITY = CAP_GENERAL_DLL    
-}
\ No newline at end of file
+}
+
+symbian:MMP_RULES += SMPSAFE
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/package_definition.xml	Fri Sep 03 17:34:04 2010 +0530
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="contentcontrol" name="Content Control Daemons" levels="plugin framework app">
+  <collection id="contentctrl_plat" name="Content Control Daemons Platforn Interfaces" level="app">
+  <component id="ds_contact_adapter_customization_api" name="DS Contact Adapter Customization API" class="api" filter="s60" introduced="^3">
+   <meta rel="Api" href="contentctrl_plat/ds_contact_adapter_customization_api/ds_contact_adapter_customization_api.metaxml"/>
+   <unit bldFile="contentctrl_plat/ds_contact_adapter_customization_api/group"/>
+   </component>
+   <component id="ds_contactsdatastoreextension_api" name="DS Contacts Data Store Extension API" class="api" filter="s60" introduced="^4">
+    <meta rel="Api" href="contentctrl_plat/ds_contactsdatastoreextension_api/ds_contactsdatastoreextension_api.metaxml"/>
+    <unit bldFile="contentctrl_plat/ds_contactsdatastoreextension_api/group"/>
+   </component>
+   <component id="ds_data_modification_api" name="DS Data Modification API" class="api" filter="s60" introduced="^3">
+    <meta rel="Api" href="contentctrl_plat/ds_data_modification_api/ds_data_modification_api.metaxml"/>
+    <unit bldFile="contentctrl_plat/ds_data_modification_api/group"/>
+   </component>
+  </collection>
+  <collection id="connectivitymodules" name="Connectivity Modules" level="framework">
+   <component id="secon" filter="s60" name="Service Controllers">
+    <unit bldFile="connectivitymodules/secon/group"/>
+   </component>
+  </collection>
+  <collection id="dsdcmoadapter" name="Data Sync DCMO Adapter" level="plugin">
+   <!-- Component at wrong rank, should move down a directory -->
+   <component id="dsdcmoadapter_build" filter="s60" name="Data Sync Control DCMO Adapter">
+    <unit bldFile="dsdcmoadapter/group"/>
+   </component>
+  </collection>
+  <collection id="omads" name="OMA Data Sync" level="app">
+   <component id="omads_build" filter="s60" name="OMA DS Build">
+    <unit bldFile="omads/group"/> <!-- need to remove #include and rename and OMA DS ROM -->
+   </component>
+   <component id="omadsextensions" filter="s60" name="OMA DS Extensions" class="plugin">
+    <unit bldFile="omads/omadsextensions/group"/>
+   </component>
+   <component id="omadsextensions_qt" filter="s60" name="OMA DS Qt Extensions" class="plugin">
+    <unit bldFile="omads/omadsextensions" qt:proFile="omadsextensions.pro"/>
+   </component>
+  </collection>
+ </package>
+</SystemDefinition>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/package_map.xml	Fri Sep 03 17:34:04 2010 +0530
@@ -0,0 +1,1 @@
+<PackageMap root="sf" layer="app"/>