# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1268572326 0
# Node ID 1b024573da705db3de13b790677fa1bfdde9525d
# Parent  3d85de3d90be6c7658763ae8960afe77234ce9be# Parent  57a65a3a658cc2ba9279eca0ff79427af8930c26
Automatic merge from PDK_3.0.h

diff -r 3d85de3d90be -r 1b024573da70 dcmofw/dcmoserver/group/bld.inf
--- a/dcmofw/dcmoserver/group/bld.inf	Mon Mar 08 21:44:11 2010 +0000
+++ b/dcmofw/dcmoserver/group/bld.inf	Sun Mar 14 13:12:06 2010 +0000
@@ -24,9 +24,9 @@
 
 // Generic configuration interface for component cenrep settings  
 ../conf/dcmo.confml                   MW_LAYER_CONFML(dcmo.confml)
-../conf/dcmo_2001FE47.crml 	    	    MW_LAYER_CONFML(dcmo_2001FE47.crml)
+../conf/dcmo_2001FE47.crml 	    	    MW_LAYER_CRML(dcmo_2001FE47.crml)
 ../conf/cameracontrol.confml       		MW_LAYER_CONFML(cameracontrol.confml)
-../conf/cameracontrol_2000253D.crml 	MW_LAYER_CONFML(cameracontrol_2000253D.crml)
+../conf/cameracontrol_2000253D.crml 	MW_LAYER_CRML(cameracontrol_2000253D.crml)
 
 PRJ_MMPFILES
 dcmoserver.mmp
diff -r 3d85de3d90be -r 1b024573da70 fotaapplication/fotaserver/FotaServer/group/fotaserver.mmp
--- a/fotaapplication/fotaserver/FotaServer/group/fotaserver.mmp	Mon Mar 08 21:44:11 2010 +0000
+++ b/fotaapplication/fotaserver/FotaServer/group/fotaserver.mmp	Sun Mar 14 13:12:06 2010 +0000
@@ -78,9 +78,7 @@
 
 LIBRARY     aknskins.lib
 LIBRARY     apgrfx.lib
-LIBRARY     apengine.lib
 LIBRARY     apparc.lib
-LIBRARY     apsettingshandlerui.lib 
 LIBRARY     avkon.lib
 LIBRARY     bafl.lib
 LIBRARY     cone.lib
diff -r 3d85de3d90be -r 1b024573da70 fotaapplication/fotaserver/FotaServer/inc/FotaServer.h
--- a/fotaapplication/fotaserver/FotaServer/inc/FotaServer.h	Mon Mar 08 21:44:11 2010 +0000
+++ b/fotaapplication/fotaserver/FotaServer/inc/FotaServer.h	Sun Mar 14 13:12:06 2010 +0000
@@ -93,6 +93,7 @@
 
 _LIT_SECURITY_POLICY_C1( KReadPolicy, ECapabilityReadDeviceData );
 _LIT_SECURITY_POLICY_C1( KWritePolicy, ECapabilityWriteDeviceData );
+_LIT_SECURITY_POLICY_PASS(KAllowAllPolicy);
 
 //Constants for Device Encryption operation
 enum TDEOperations
diff -r 3d85de3d90be -r 1b024573da70 fotaapplication/fotaserver/FotaServer/inc/fotaupdate.h
--- a/fotaapplication/fotaserver/FotaServer/inc/fotaupdate.h	Mon Mar 08 21:44:11 2010 +0000
+++ b/fotaapplication/fotaserver/FotaServer/inc/fotaupdate.h	Sun Mar 14 13:12:06 2010 +0000
@@ -200,7 +200,9 @@
     /**Show the No reminder             */  
 	ENoReminderOn,
 	/**Show the No reminder             */   
-    ENoReminderOff
+    ENoReminderOff,
+    /* Added for postpone limit, When All the postpones are used and user presses end key this command is sent */
+    EEndKeyReminder
 	};
 
 private:
@@ -251,6 +253,15 @@
      * @return  None
      */
     void GetSchedulesInfoL();
+    
+    /**
+     * DisplayInstallationNoteType determines the proper installation note based on the Cenrep keys.
+     *
+     * @since   S60   v5.0
+     * @param   None
+     * @return  None
+     */
+    void DisplayInstallationNoteTypeL();
 
 
     /**
@@ -261,7 +272,21 @@
      * @param   aIntparam
      * @return  none
      */
-    void LaunchNotifierL(  const TSyncMLFwUpdNoteTypes aNotetype , const TInt aIntParam, const TInt aEnc=EFalse );
+    void LaunchNotifierL(  const TSyncMLFwUpdNoteTypes aNotetype , const TInt aIntParam,const TInt aEnc=EFalse);
+    
+    
+    /**
+     * Launch the postpone information note, when the postpone limit feature is enabled.
+     *
+     * @since   S60   v5.0
+     * @param   aNotetype
+     * @param   aIntparam
+     * @param   aIntParam1
+     * @param   aIntervalType
+     * @param   aInterval
+     * @return  none
+     */
+    void LaunchNotifierL( const TSyncMLFwUpdNoteTypes aNotetype,const TInt aIntParam,const TInt aIntParam1,TIntervalType aIntervalType,const TInt aInterval);
 
 	/**
 	 * Prepare and display Reminder Dialog using RFotaReminderDlg
@@ -277,12 +302,12 @@
 	 * @since 	S60	  v3.1
 	 *
 	 * @param package id 
-	 * @param interval type
+	 * @param intervaltype
 	 * @param interval
 	 * @return TInt 
 	 */
     TInt CreateScheduleL ( const TInt aPackageId
-            ,const TIntervalType aIntervalType,const TInt aInterval);
+            ,TIntervalType aIntervalType,const TInt aInterval);
             
             
   /**
@@ -381,7 +406,6 @@
 	* fota update reminder task
 	*/
 	TFotaScheduledUpdate* iScheduledUpdate;
-
 	/*
 	 * flag to handle showing the reminder dialog twice.
 	 */
@@ -395,7 +419,29 @@
 	/*
 	 * to finalize update later
 	 */
-	TBool iFinalizeLater;
+	 
+ 	TBool iFinalizeLater;
+	 
+		/*
+	 * flag to enable the FOTA Update Postpone  limit feature.
+	 */
+	TInt iFOTAUICustomization;
+	
+	/*
+	 * To Store the number of postpones done by the user.
+	 */
+	TInt iFOTAUserPostponeCount;
+	
+	/*
+	 * To Store the maximum number of postpones allowed for the user.
+	 */
+	TInt iFOTAMaxPostponeCount;
+	
+	/*
+	 * To Get the Configuration values related to FOTA
+	 */
+	CRepository* iCentrep;
+	
     };
 
 
diff -r 3d85de3d90be -r 1b024573da70 fotaapplication/fotaserver/FotaServer/src/FotaServer.cpp
--- a/fotaapplication/fotaserver/FotaServer/src/FotaServer.cpp	Mon Mar 08 21:44:11 2010 +0000
+++ b/fotaapplication/fotaserver/FotaServer/src/FotaServer.cpp	Sun Mar 14 13:12:06 2010 +0000
@@ -24,8 +24,9 @@
 #include <schtime.h>
 #include <csch_cli.h>
 #include <e32property.h>
-#include <ApUtils.h> 
-#include <commdb.h>
+#include <nsmldmconst.h>
+#include <cmmanager.h>
+#include <cmconnectionmethod.h>
 #include <DevManInternalCRKeys.h>
 #include <nsmlconstants.h>
 #include <centralrepository.h>
@@ -253,6 +254,10 @@
 	        FLOG(_L("Using IAP: %d to send GA"),iapid);
 	        FLOG(_L("From Db Using IAP: %d to send GA"),aState.iIapId);
 	        RSyncMLDevManJob    dmJob;
+	        
+	        RProperty::Define(KPSUidNSmlSOSServerKey,KNSmlDMSilentJob,RProperty::EInt,KAllowAllPolicy,KWritePolicy);
+	        TInt r2=RProperty::Set(KPSUidNSmlSOSServerKey,KNSmlDMSilentJob,ESilent);
+			FLOG(_L("CFotaServer::CreateDeviceManagementSessionL KNSmlDMSilentJob set err %d"),r2);
 	        TBuf<10> genalertap,temp;
 	        genalertap.Zero();
 	        temp.Zero();	  
@@ -867,11 +872,14 @@
         FLOG(_L("   trycount %d => creating new job"),iSyncMLAttempts);
 	    RSyncMLDevManJob    dmJob;
     	if(iIapId > KErrNotFound)
-    		{
-    		FLOG(_L("DoCloseSMLSessionL new job uses iap from fotadb %d"),
-    				iIapId);
-    		dmJob.CreateL( iSyncMLSession, iSyncProfile,iIapId );
-    		}
+    	    {
+            FLOG(_L("DoCloseSMLSessionL new job uses iap from fotadb %d"),
+                    iIapId);
+   	        RProperty::Define(KPSUidNSmlSOSServerKey,KNSmlDMSilentJob,RProperty::EInt,KAllowAllPolicy,KWritePolicy);
+            TInt r2=RProperty::Set(KPSUidNSmlSOSServerKey,KNSmlDMSilentJob,ESilent);
+			FLOG(_L("CFotaServer::DoCloseSMLSessionL() KNSmlDMSilentJob set err %d"),r2);
+            dmJob.CreateL( iSyncMLSession, iSyncProfile,iIapId );
+    	    }
     	else
     		{
     		FLOG(_L("DoCloseSMLSessionL new job uses iap from profile"));
@@ -2275,12 +2283,15 @@
 TBool CFotaServer::CheckIapExistsL(TUint32 aIapId)
     {
     FLOG(_L("CFotaServer::CheckIapExistsL >>"));
-    CCommsDatabase* commDb = CCommsDatabase::NewL( EDatabaseTypeIAP );
-    CleanupStack::PushL( commDb );
-    CApUtils* aputils = CApUtils::NewLC(*commDb);
-    TBool exists = aputils->IAPExistsL( aIapId);      
-    CleanupStack::PopAndDestroy( aputils );
-    CleanupStack::PopAndDestroy( commDb );
+    TBool exists = EFalse;  
+    RCmManager cmManager;    
+    cmManager.OpenLC();
+    RCmConnectionMethod conn;
+    TRAPD(err, conn = cmManager.ConnectionMethodL( aIapId ));
+    if(err == KErrNone)//connection method exists
+       exists = ETrue;
+    conn.Close();
+    CleanupStack::PopAndDestroy();//cmManager                    
     FLOG(_L("CFotaServer::CheckIapExistsL <<"));
     return exists;
     }
diff -r 3d85de3d90be -r 1b024573da70 fotaapplication/fotaserver/FotaServer/src/FotaSrvDocument.cpp
--- a/fotaapplication/fotaserver/FotaServer/src/FotaSrvDocument.cpp	Mon Mar 08 21:44:11 2010 +0000
+++ b/fotaapplication/fotaserver/FotaServer/src/FotaSrvDocument.cpp	Sun Mar 14 13:12:06 2010 +0000
@@ -19,8 +19,6 @@
 
 // INCLUDE FILES
 #include <StringLoader.h>
-#include <ApSelect.h>
-#include <ApUtils.h>
 #include <collate.h>
 #include <featmgr.h>
 #include <fotaserver.rsg>
diff -r 3d85de3d90be -r 1b024573da70 fotaapplication/fotaserver/FotaServer/src/fotadownload.cpp
--- a/fotaapplication/fotaserver/FotaServer/src/fotadownload.cpp	Mon Mar 08 21:44:11 2010 +0000
+++ b/fotaapplication/fotaserver/FotaServer/src/fotadownload.cpp	Sun Mar 14 13:12:06 2010 +0000
@@ -1387,7 +1387,8 @@
 
 	// 2/3 GET IAP FROM ESOCK ----------------------------------------------
 	// resolve which accespoint is used for current DM session
-	if ( profIapid == KErrNotFound && aIapid==KErrNotFound)
+	if ( (profIapid == KErrNotFound || profIapid == KErrGeneral)  
+			&& aIapid==KErrNotFound)
 		{
 		RSocketServ serv;
 		CleanupClosePushL( serv );
@@ -1451,8 +1452,8 @@
 		CleanupStack::PopAndDestroy( 2 ); // conn, serv		
 		}
 	TInt newIapid( KErrNotFound );
-	if ( sockIapid!=KErrNotFound ) newIapid = sockIapid;
-	if ( profIapid!=KErrNotFound ) newIapid = profIapid;
+	if ( sockIapid!=KErrNotFound  ) newIapid = sockIapid;
+	if ( profIapid!=KErrNotFound && profIapid != KErrGeneral ) newIapid = profIapid;
 	if ( aIapid   !=KErrNotFound ) newIapid = aIapid;
 
 	//Do some intelligent work during resume
@@ -1468,17 +1469,17 @@
 	if (active==EFalse && iDLState.iState == RFotaEngineSession::EDownloadProgressingWithResume)
 		{
 		//Actual resume only
-		if (!iUserInitiatedResume && profIapid == KErrNotFound  )
+		if (!iUserInitiatedResume && (profIapid == KErrNotFound || profIapid == KErrGeneral  ) )
 			{
 			//FMS triggered resume, apply Rule 1
 			newIapid = iDLState.iIapId;
 			}
-		else if (profIapid == KErrNotFound)
+		else if (profIapid == KErrNotFound || profIapid == KErrGeneral )
 			{
 			//User triggered resume, apply Rule 2
 			newIapid = KErrNotFound;
 			}
-		else if (profIapid != iDLState.iIapId)
+		else if (profIapid != iDLState.iIapId && profIapid > KErrNone)
 			{
 			//IAP has changed in DM profile, apply Rule 3
 			newIapid = profIapid;
diff -r 3d85de3d90be -r 1b024573da70 fotaapplication/fotaserver/FotaServer/src/fotaupdate.cpp
--- a/fotaapplication/fotaserver/FotaServer/src/fotaupdate.cpp	Mon Mar 08 21:44:11 2010 +0000
+++ b/fotaapplication/fotaserver/FotaServer/src/fotaupdate.cpp	Sun Mar 14 13:12:06 2010 +0000
@@ -135,7 +135,7 @@
 // ---------------------------------------------------------------------------
 //
 CFotaUpdate::CFotaUpdate() : CActive(EPriorityNormal) 
-,iScheduledUpdate(NULL),iHandleUpdateAcceptLater(EFalse)
+,iScheduledUpdate(NULL),iHandleUpdateAcceptLater(EFalse),iCentrep(NULL)
                 {
                 CActiveScheduler::Add( this ); 
                 iNotifParams.iNoteType  = ESyncMLFwUpdUnknown;  
@@ -158,6 +158,11 @@
         }
     iIntervalType.Close();  
     iInterval.Close();  
+   if(iCentrep)
+       {
+       delete iCentrep;
+       iCentrep = NULL;
+       }
     }
 
 
@@ -442,7 +447,7 @@
 
         }
     // Handle update start query
-    if ( iNotifParams.iNoteType == ESyncMLFwUpdStartQuery )
+    if ( iNotifParams.iNoteType == ESyncMLFwUpdStartQuery || iNotifParams.iNoteType == ESyncMLFwUpdForceQuery || iNotifParams.iNoteType == ESyncMLFwUpdPostponeLimitQuery)
         {
         FLOG(_L("   update start query"));
         // User pressed accept
@@ -865,6 +870,65 @@
 
 
 // ---------------------------------------------------------------------------
+// CFotaUpdate::LaunchNotifierL
+// Shows the postpone information note when postpone limit feature is enabled.
+// ---------------------------------------------------------------------------
+void CFotaUpdate::LaunchNotifierL( const TSyncMLFwUpdNoteTypes aNotetype
+                                            ,const TInt aIntUserPostpone,const TInt aIntMaxPostpone,TIntervalType aIntervalType,const TInt aInterval)
+    {
+    FLOG(_L("CFotaUpdate::LaunchNotifierL() >>  prof.Id: %d aIntUserPostpone: %d aIntMaxPostpone %d")
+                                            ,iUpdateState.iProfileId,aIntUserPostpone,aIntMaxPostpone);
+    if (!IsActive())
+        {
+        TSyncMLFwUpdNotifParams         params;
+        
+        // Parameters to display the information note is displayed
+    params.iNoteType        = aNotetype;
+    params.iFotaUserPostponeCount = aIntUserPostpone;
+    params.iFotaMaxPostponeCount = aIntMaxPostpone;
+    params.iIntervalType = aIntervalType;
+    params.iInterval = aInterval;
+    
+    /*
+    if(iReminderString.Length() > 0)
+        params.iSelectedReminder.Copy(iReminderString);
+    
+    TBuf<5> aTime;
+    aTime.Zero();
+    
+    for(TInt i = 0; i<iReminderString.Length();i++)
+        {
+        TChar ch = iReminderString[i];
+        if ( ch.IsDigit())            //separates digits from the string
+            {  
+            aTime.Append(ch); 
+            }
+        else
+            {
+            break;
+            }
+        }
+    
+    TInt val =1 ; 
+    TLex  lex(aTime);
+    TInt err = lex.Val(val); */
+
+    TSyncMLFwUpdNotifParamsPckg     pckg(params);
+    iNotifParams.iNoteType  = params.iNoteType;
+    iNotifParams.iIntParam  = params.iIntParam;
+    iDummyResponsePckg = TSyncMLFwUpdNotifRetValPckg();
+    User::LeaveIfError( iNotifier.Connect() );
+    iNotifier.StartNotifierAndGetResponse( iStatus,KSyncMLFwUpdNotifierUid
+                                            , pckg, iDummyResponsePckg );
+    SetActive();
+        }
+    FLOG(_L("CFotaUpdate::LaunchNotifierL() <<"));
+    }
+
+
+
+
+// ---------------------------------------------------------------------------
 // CFotaUpdate::UpdateL
 // Updates the fw: Creates input files for update agent and boots device to 
 // update mode.
@@ -948,9 +1012,11 @@
     if (err==KErrNone ) 
         {
         centrep2->Set(  KFotaUpdateState, EFotaPendingGenAlert );
-        }
-    delete centrep2;
-
+        if(iFOTAUICustomization)
+            centrep2->Set(  KFOTAUserPostponeCount, 0 );
+       }
+     delete centrep2;
+     
     // Boot to update mode 
     LaunchNotifierL( ESyncMLFwUpdRebootNote, KErrNone);
 
@@ -1141,7 +1207,8 @@
         if (!ret)
             {
             //Drive is not encrypted
-            LaunchNotifierL( ESyncMLFwUpdStartQuery, iUpdateState.iProfileId );
+			DisplayInstallationNoteTypeL();
+            //LaunchNotifierL( ESyncMLFwUpdStartQuery, iUpdateState.iProfileId );
             }
         else
             {
@@ -1174,7 +1241,8 @@
         if (!ret)
             {
             //Drive is not encrypted
-            LaunchNotifierL( ESyncMLFwUpdStartQuery, iUpdateState.iProfileId );
+			DisplayInstallationNoteTypeL();
+            //LaunchNotifierL( ESyncMLFwUpdStartQuery, iUpdateState.iProfileId );
             }
         else
             {
@@ -1195,6 +1263,70 @@
     FLOG(_L("CFotaUpdate::StartUpdateL(TDownloadIPCParams aParams) << \
     pkig:%d"),aParams.iPkgId);
     }
+	
+	
+void CFotaUpdate::DisplayInstallationNoteTypeL()
+    {
+    FLOG(_L("CFotaUpdate::DisplayInstallationNoteTypeL: >>"));
+    
+    //CRepository* centrep = NULL;
+    TInt err = KErrNone;
+    TInt CustomNotes = 0;
+	if(iCentrep == NULL)
+	{
+    TRAP(err, iCentrep = CRepository::NewL(TUid::Uid(KFotaServerUid)));
+    if(err)
+        {
+        FLOG(_L("DisplayInstallationNoteTypeL: reading from cenrep failed, returning ENormal"));
+        LaunchNotifierL( ESyncMLFwUpdStartQuery, iUpdateState.iProfileId );
+        return;
+        }
+	}
+    
+    err= iCentrep->Get( KFOTAUINotesCustomization, CustomNotes);    
+    if (err)
+        CustomNotes = 0;
+    iFOTAUICustomization = CustomNotes;
+    
+    if(iFOTAUICustomization)
+        {
+        //TRAP(err, centrep = CRepository::NewL( TUid::Uid(KFotaServerUid)));
+        //if(err)
+        //    {
+        //    FLOG(_L("DetermineNoteType: reading from cenrep failed, returning ETrue"));
+        //    return ETrue;
+        //    }
+        
+        TInt fotaUserPostpone = 0,fotaMaxPostpone = 3;
+        if(iCentrep)
+            {
+            iCentrep->Get( KFOTAUserPostponeCount , fotaUserPostpone );
+            iCentrep->Get( KFOTAMaxPostponeCount , fotaMaxPostpone );
+            }
+        iFOTAUserPostponeCount = fotaUserPostpone;
+        iFOTAMaxPostponeCount = fotaMaxPostpone;
+
+        if(iFOTAUserPostponeCount < iFOTAMaxPostponeCount)
+            {
+            FLOG(_L("DisplayInstallationNoteTypeL: returning EPostponeLimit"));
+            LaunchNotifierL( ESyncMLFwUpdPostponeLimitQuery, iUpdateState.iProfileId );
+            //return EPostponeLimit;
+            }
+        else
+            {
+            FLOG(_L("DisplayInstallationNoteTypeL: returning EForceStart"));
+            LaunchNotifierL( ESyncMLFwUpdForceQuery, iUpdateState.iProfileId );
+            //return EForceStart;
+            }
+        }
+    else
+        {
+        FLOG(_L("DisplayInstallationNoteTypeL: returning ENormal"));
+        LaunchNotifierL( ESyncMLFwUpdStartQuery, iUpdateState.iProfileId );
+        //return ENormal;
+        }
+    
+    }
 
 
 
@@ -1480,6 +1612,31 @@
 void CFotaUpdate::ShowReminderDialogL()
     {
     // Push default content to navigation pane and change title
+	if(iFOTAUICustomization)
+	    {
+	    //if(iFOTAUICustomization)
+	    //    {
+	        if(iCentrep)
+	            {
+	            // When User has pressed Later, Postpone limit has to be Incremented
+	            iFOTAUserPostponeCount = iFOTAUserPostponeCount + 1;
+	            iCentrep->Set( KFOTAUserPostponeCount , iFOTAUserPostponeCount );
+	            }
+	    //    }
+	    
+	    
+	    if(iFOTAUserPostponeCount > iFOTAMaxPostponeCount)
+	        {
+	        // When User presses the end key during a Force Update Query or a Update Warning note, Force Update Query should be shown again.
+	        TIntervalType   tIntervalType;    
+	        TInt tInterval;
+	        tIntervalType = (TIntervalType)EEndKeyReminder;
+	        tInterval = 1;
+	        CreateScheduleL ( iUpdateState.iPkgId, tIntervalType ,tInterval );
+	        iFotaServer->FinalizeUpdateL();
+	        return;
+	        }
+	    }
     CEikStatusPane* statusPane = iAvkonAppUi->StatusPane();
     CAknNavigationControlContainer* naviPane = NULL;
     HBufC* originalTitle;
@@ -1593,6 +1750,8 @@
         FLOG(_L("Creating reminder: for 1st option"));
         tIntervalType = (TIntervalType)iIntervalType[aRadioSelectionIndex];				
         tInterval     = iInterval[aRadioSelectionIndex];
+        if(iFOTAUICustomization)
+                    LaunchNotifierL( ESyncMLFwUpdPostponeNote , iFOTAUserPostponeCount, iFOTAMaxPostponeCount, tIntervalType,tInterval);
         en=FindScheduleL( ETrue );
         CreateScheduleL ( iUpdateState.iPkgId, tIntervalType ,tInterval );
         iFotaServer->FinalizeUpdateL();
@@ -1602,6 +1761,8 @@
         FLOG(_L("Creating reminder: 4 hours"));
         tIntervalType = (TIntervalType)iIntervalType[aRadioSelectionIndex];				
         tInterval     = iInterval[aRadioSelectionIndex];
+        if(iFOTAUICustomization)
+                    LaunchNotifierL( ESyncMLFwUpdPostponeNote , iFOTAUserPostponeCount, iFOTAMaxPostponeCount, tIntervalType,tInterval);
         en=FindScheduleL( ETrue );
         CreateScheduleL ( iUpdateState.iPkgId, tIntervalType ,tInterval );
         iFotaServer->FinalizeUpdateL();
@@ -1611,6 +1772,8 @@
         FLOG(_L("Creating reminder: for 2nd option"));
         tIntervalType = (TIntervalType)iIntervalType[aRadioSelectionIndex];				
         tInterval     = iInterval[aRadioSelectionIndex];
+        if(iFOTAUICustomization)
+                    LaunchNotifierL( ESyncMLFwUpdPostponeNote , iFOTAUserPostponeCount, iFOTAMaxPostponeCount, tIntervalType,tInterval);
         en=FindScheduleL( ETrue );
         CreateScheduleL ( iUpdateState.iPkgId, tIntervalType ,tInterval );
         iFotaServer->FinalizeUpdateL();
@@ -1619,7 +1782,9 @@
         {
         FLOG(_L("Creating reminder: for 3rd option"));
         tIntervalType = (TIntervalType)iIntervalType[aRadioSelectionIndex];				
-        tInterval     = iInterval[aRadioSelectionIndex];  
+        tInterval     = iInterval[aRadioSelectionIndex];
+        if(iFOTAUICustomization)
+                    LaunchNotifierL( ESyncMLFwUpdPostponeNote , iFOTAUserPostponeCount, iFOTAMaxPostponeCount, tIntervalType,tInterval);
         en=FindScheduleL( ETrue );
         CreateScheduleL ( iUpdateState.iPkgId, tIntervalType ,tInterval );  
         iFotaServer->FinalizeUpdateL();
@@ -1631,8 +1796,17 @@
 
         if ( !aRet ) // cancel pressed
             {
-            LaunchNotifierL( ESyncMLFwUpdStartQuery, iUpdateState.iProfileId );
-            }
+			if(iFOTAUICustomization)
+			    {
+			    if(iCentrep)
+			        {
+			        	// When User has pressed Later and then does a cancel for the warning query, Postpone limit has to be decremented
+			        iFOTAUserPostponeCount = iFOTAUserPostponeCount - 1;
+			        iCentrep->Set( KFOTAUserPostponeCount , iFOTAUserPostponeCount );
+			        }
+			    }
+			DisplayInstallationNoteTypeL();			
+			}
         else			  // ok pressed
             {
             LaunchNotifierL( ESyncMLFwUpdNoReminder , KErrNone );
@@ -1725,8 +1899,8 @@
 // ---------------------------------------------------------------------------
 //
 TInt CFotaUpdate::CreateScheduleL ( const TInt aPackageId 
-        ,const TIntervalType  aIntervalType
-        ,const TInt aInterval)
+                                   ,TIntervalType  aIntervalType
+                                   ,const TInt aInterval)
     {
     FLOG(_L("CFotaUpdate::CreateScheduleL ()") );
     const TInt KRepeatForever = 0;
@@ -1755,6 +1929,10 @@
         case EYearly  :
             t = t + ((TTimeIntervalYears ) aInterval);
             break;
+		case EEndKeyReminder:
+                        aIntervalType = (TIntervalType)EHourly;  
+                        t = t + ((TTimeIntervalMinutes)aInterval);
+                        break;
         default :
             User::Panic(KFotaPanic, KErrArgument);
 
diff -r 3d85de3d90be -r 1b024573da70 fotaapplication/fotaserver/cenrep/fotaserverPrivateCRKeys.h
--- a/fotaapplication/fotaserver/cenrep/fotaserverPrivateCRKeys.h	Mon Mar 08 21:44:11 2010 +0000
+++ b/fotaapplication/fotaserver/cenrep/fotaserverPrivateCRKeys.h	Sun Mar 14 13:12:06 2010 +0000
@@ -99,6 +99,29 @@
 //1   - Install update note will be displayed when a call is active
 const TUint32 KFotaUpdateNoteDisplayAlways= 0x0000000C;
 
+/*
+* This key is used to determine the maximum number of postpones allowed for a FOTA Update.
+* Default value : 3
+*/
+
+const TUint32 KFOTAMaxPostponeCount = 0x0000000D; 
+
+
+/*
+* This key is used to determine the number of postpones done by the user for a particular FOTA Update.
+* Default value : 0
+*/
+
+const TUint32 KFOTAUserPostponeCount = 0x0000000E; 
+
+
+/*
+* This flag defines if the feature to enable  the customized UI notes for interacttrive and note between firware install and update.
+* Default value : 0
+*/
+
+const TUint32 KFOTAUINotesCustomization = 0x0000000F; 
+
 #endif // FOTASERVER_PRIVATE_KEYS_H
             
 // End of File
diff -r 3d85de3d90be -r 1b024573da70 fotaapplication/fotaserver/conf/fotaserver.confml
Binary file fotaapplication/fotaserver/conf/fotaserver.confml has changed
diff -r 3d85de3d90be -r 1b024573da70 fotaapplication/fotaserver/conf/fotaserver_102072C4.crml
Binary file fotaapplication/fotaserver/conf/fotaserver_102072C4.crml has changed
diff -r 3d85de3d90be -r 1b024573da70 layers.sysdef.xml
--- a/layers.sysdef.xml	Mon Mar 08 21:44:11 2010 +0000
+++ b/layers.sysdef.xml	Sun Mar 14 13:12:06 2010 +0000
@@ -9,6 +9,9 @@
       <module name="remotemgmt">
         <unit unitID="spdo.remotemgmt" mrp="" bldFile="&layer_real_source_path;/group" name="remotemgmt" />
       </module>
+      <module name="policyenginepolicies"> 
+     	<unit unitID="spdo.remotemgmt.policyenginepolicies" mrp="" bldFile="&layer_real_source_path;/policymanagement/policyengine/policyenginepolicies/group" filter="!dfs_build"  name="spdo_remotemgmt_policyenginepolicies"  />
+     </module>
     </layer>
   </systemModel>
 </SystemDefinition>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 omaprovisioning/provisioning/ProvisioningBC/Inc/CWPSaver.h
--- a/omaprovisioning/provisioning/ProvisioningBC/Inc/CWPSaver.h	Mon Mar 08 21:44:11 2010 +0000
+++ b/omaprovisioning/provisioning/ProvisioningBC/Inc/CWPSaver.h	Sun Mar 14 13:12:06 2010 +0000
@@ -22,8 +22,8 @@
 // INCLUDES
 #include <AknProgressDialog.h>
 #include <ActiveApDb.h>
-#include <FavouritesDbObserver.h>
-#include <FavouritesDb.h>
+#include <favouritesdbobserver.h>
+#include <favouritesdb.h>
 
 
 // FORWARD DECLARATIONS
diff -r 3d85de3d90be -r 1b024573da70 omaprovisioning/provisioning/WAPAdapter/Inc/CWPWAPBookmarkItem.h
--- a/omaprovisioning/provisioning/WAPAdapter/Inc/CWPWAPBookmarkItem.h	Mon Mar 08 21:44:11 2010 +0000
+++ b/omaprovisioning/provisioning/WAPAdapter/Inc/CWPWAPBookmarkItem.h	Sun Mar 14 13:12:06 2010 +0000
@@ -22,8 +22,8 @@
 // INCLUDES
 #include <e32base.h>
 #include <MWPVisitor.h>
-#include <FavouritesDb.h>
-#include <FavouritesSession.h>
+#include <favouritesdb.h>
+#include <favouritessession.h>
 #include "CWPWAPItemBAse.h"
 
 
diff -r 3d85de3d90be -r 1b024573da70 omaprovisioning/provisioning/WAPAdapter/Inc/CWPWAPBrowserAdapter.h
--- a/omaprovisioning/provisioning/WAPAdapter/Inc/CWPWAPBrowserAdapter.h	Mon Mar 08 21:44:11 2010 +0000
+++ b/omaprovisioning/provisioning/WAPAdapter/Inc/CWPWAPBrowserAdapter.h	Sun Mar 14 13:12:06 2010 +0000
@@ -23,7 +23,7 @@
 #include "CWPWAPAdapterBase.h"
 
 #include <favouritessession.h>
-#include <FavouritesDb.h>
+#include <favouritesdb.h>
 
 
 // FORWARD DECLARATIONS
diff -r 3d85de3d90be -r 1b024573da70 omaprovisioning/provisioning/WAPAdapter/Src/CWPWAPBookmarkItem.cpp
--- a/omaprovisioning/provisioning/WAPAdapter/Src/CWPWAPBookmarkItem.cpp	Mon Mar 08 21:44:11 2010 +0000
+++ b/omaprovisioning/provisioning/WAPAdapter/Src/CWPWAPBookmarkItem.cpp	Sun Mar 14 13:12:06 2010 +0000
@@ -22,7 +22,7 @@
 #include <CWPCharacteristic.h>
 #include <CWPParameter.h>
 #include <favouritesdb.h>
-#include <FavouritesItemList.h>         // CFavouritesItemList
+#include <favouritesitemlist.h>         // CFavouritesItemList
 #include <wpwapadapterresource.rsg>
 #include <CWPAdapter.h>
 #include "CWPWAPBookmarkItem.h"
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/group/INITIAL_POLICIES.mk
--- a/policymanagement/group/INITIAL_POLICIES.mk	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-#
-# 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: Implementation of policymanagement components
-#
-
-RESOURCE:
-	.\tarm_policy_conf.cmd
-
-RELEASABLES:
-CLEAN:
-REALLYCLEAN:
-LIB:
-BLD:
-MAKEFILE:
-LIBRARY:
-FINAL:
-TARGET:
-SAVESPACE:
-MAKMAKE:	
-FREEZE:
-
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/group/bld.inf
--- a/policymanagement/group/bld.inf	Mon Mar 08 21:44:11 2010 +0000
+++ b/policymanagement/group/bld.inf	Sun Mar 14 13:12:06 2010 +0000
@@ -28,71 +28,12 @@
 ../conf/policy_management_10207815.crml 	        MW_LAYER_CRML(policy_management_10207815.crml)
 ../conf/policy_management_10207816.crml 	        MW_LAYER_CRML(policy_management_10207816.crml)
 ../conf/policy_management_10207843.crml 	        MW_LAYER_CRML(policy_management_10207843.crml)
-./genericcopy.flm                                   /epoc32/tools/makefile_templates/policy/genericcopy.flm
-./genericcopy.xml 			            /epoc32/tools/makefile_templates/policy/genericcopy.xml
-./genericcopy.meta 			            /epoc32/tools/makefile_templates/policy/genericcopy.meta
-
 
 
 PRJ_EXTENSIONS
 
-#ifdef SBSV2
-
-
-START EXTENSION policy/genericcopy
-OPTION TARGETDIR epoc32/data/Z/private/10207815
-OPTION SOURCEDIR sf/mw/remotemgmt/policymanagement/policyengine/Data/policies
-
-OPTION FILEPATTERN *.txt
-END
-
-START EXTENSION policy/genericcopy
-OPTION TARGETDIR epoc32/release/winscw/udeb/Z/private/10207815
-OPTION SOURCEDIR sf/mw/remotemgmt/policymanagement/policyengine/Data/policies
-
-OPTION FILEPATTERN *.txt
-END
-
-
-START EXTENSION policy/genericcopy
-OPTION TARGETDIR epoc32/release/winscw/urel/Z/private/10207815
-OPTION SOURCEDIR sf/mw/remotemgmt/policymanagement/policyengine/Data/policies
-
-OPTION FILEPATTERN *.txt
-END
-
-
-START EXTENSION policy/genericcopy
-OPTION TARGETDIR epoc32/release/armv5/udeb/Z/private/10207815
-OPTION SOURCEDIR sf/mw/remotemgmt/policymanagement/policyengine/Data/policies
-
-OPTION FILEPATTERN *.txt
-END
-
-
-START EXTENSION policy/genericcopy
-OPTION TARGETDIR epoc32/release/armv5/urel/Z/private/10207815
-OPTION SOURCEDIR sf/mw/remotemgmt/policymanagement/policyengine/Data/policies
-
-OPTION FILEPATTERN *.txt
-END
-#endif
-
 PRJ_MMPFILES
 
-#ifndef SBSV2 
-
-#if defined(__SERIES60_30__)
-gnumakefile initial_policies_apollo30.mk
-#else 
-gnumakefile INITIAL_POLICIES.mk
-#endif
-
-#endif
-
-
-//gnumakefile tarm_format_scripts.mk
-
 #include "../pmdmadapter/group/bld.inf"
 #include "../dmutilserver/group/bld.inf"
 #include "../policyengine/group/bld.inf"
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/group/genericcopy.flm
--- a/policymanagement/group/genericcopy.flm	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-#
-# 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: Implementation of policymanagement components
-#
-
-## Parameters that are expected:
-# SOURCEDIR 
-# TARGETDIR
-# FILEPATTERN *.txt
-
-GENERICCOPYDEBUG:=0
-ifeq ($(strip $(GENERICCOPYDEBUG)),1)
-$(info <SOURCEDIR sourcedir='$(SOURCEDIR)'/>)
-$(info <TARGETDIR targetdir='$(TARGETDIR)'/>)
-$(info <FILEPATTERN filepattern='$(FILEPATTERN)'/>)
-endif
-
-# Check if all the inputs are present
-$(if $(SOURCEDIR),,$(error Must define TARGETFILE))
-$(if $(TARGETDIR),,$(error Must define GENPATH))
-$(if $(FILEPATTERN),,$(error Must define MIFFILE))
-
-GENERICCOPYGUARD:=$(call sanitise,TARGET_$(TARGETDIR))
-
-define genericcopyfiles
-$(GENERICCOPYGUARD):=1
-
-RESOURCE:: ALL_$(TARGETDIR)
-
-ALL_$(TARGETDIR): $(TARGETDIR)_NEW_ENV
-	$(call startrule,copyfiles,FORCESUCCESS) \
-	$(GNUCP) $(EPOCROOT)/$(SOURCEDIR)/$(FILEPATTERN) $(EPOCROOT)/$(TARGETDIR)/ \
-	$(call endrule,copyfiles)
-
-$(TARGETDIR)_NEW_ENV: RM_$(TARGETDIR)
-	$(GNUMKDIR) -p $(EPOCROOT)/$(TARGETDIR)
-
-RM_$(TARGETDIR):
-	-$(GNURM) -f $(EPOCROOT)/$(TARGETDIR)/$(FILEPATTERN)
-
-endef
-
-ifeq ($($(GENERICCOPYGUARD)),)
-$(eval $(call genericcopyfiles))
-endif
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/group/genericcopy.meta
--- a/policymanagement/group/genericcopy.meta	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-#
-# 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: Implementation of policymanagement components
-#
-
-platform	win32
-makefile 	gnumake
-techstream  policy
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/group/genericcopy.xml
--- a/policymanagement/group/genericcopy.xml	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-#
-# 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: Implementation of policymanagement components
-#
--->
-
-<build xmlns="http://symbian.com/xml/build" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symbian.com/xml/build ../../schema/build/2_0.xsd">
-    <interface name="policy.genericcopy" extends="Symbian.UserFLM" flm="genericcopy.flm">
-		
-			<!-- genericcopy parameters which does not have defaults (please notice use of default attribute) -->
-			<param name='TARGETDIR' default="" />
-			<!-- Generated path -->
-			<param name='SOURCEDIR' default="" />
-			<param name='FILEPATTERN' default="" />
-    </interface>
-</build>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/group/initial_policies_apollo30.mk
--- a/policymanagement/group/initial_policies_apollo30.mk	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-#
-# 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: Implementation of policymanagement components
-#
-
-RESOURCE:
-	.\tarm_policy_conf.cmd policies_apollo30
-
-RELEASABLES:
-CLEAN:
-REALLYCLEAN:
-LIB:
-BLD:
-MAKEFILE:
-LIBRARY:
-FINAL:
-TARGET:
-MAKMAKE:	
-FREEZE:
-
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/group/tarm_format_scripts.cmd
--- a/policymanagement/group/tarm_format_scripts.cmd	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem Description: Implementation of policymanagement components
-rem
-
-echo *******************************************
-echo * CREATING FODLERS FOR FORMATTING SCRIPTS *
-echo *******************************************
-
-
-call md \epoc32\release\winscw\udeb\Z\private\1020783F
-call md \epoc32\release\winscw\urel\Z\private\1020783F
-call md \epoc32\release\armv5\udeb\Z\private\1020783F
-call md \epoc32\release\armv5\urel\Z\private\1020783F
-call echo done
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/group/tarm_format_scripts.mk
--- a/policymanagement/group/tarm_format_scripts.mk	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-#
-# 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: Implementation of policymanagement components
-#
-
-
-RESOURCE:
-	.\tarm_format_scripts.cmd
-	
-RELEASABLES:
-CLEAN:
-REALLYCLEAN:
-LIB:
-BLD:
-MAKEFILE:
-LIBRARY:
-FINAL:
-TARGET:
-MAKMAKE:	
-FREEZE:
-
-
-
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/group/tarm_policy_conf.cmd
--- a/policymanagement/group/tarm_policy_conf.cmd	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem Description: Implementation of policymanagement components
-rem
-
-echo *************************
-echo * Policy file configure *
-echo *************************
-
-
-
-set policy_dir=policies
-if not "%1"=="" set policy_dir=%1
-
-if not exist \epoc32\data\Z\private\10207815\thirdpartypolicy.txt (
-
-
-call md \epoc32\data\Z\private\10207815
-call del /q \epoc32\data\Z\private\10207815\*.* 
-call copy ..\policyengine\data\%policy_dir%\*.txt \epoc32\data\Z\private\10207815
-
-call md \epoc32\release\winscw\udeb\Z\private\10207815
-call del /q \epoc32\release\winscw\udeb\Z\private\10207815\*.*
-call copy ..\policyengine\data\%policy_dir%\*.txt \epoc32\release\winscw\udeb\Z\private\10207815
-
-call md \epoc32\release\winscw\urel\Z\private\10207815
-call del /q \epoc32\release\winscw\urel\Z\private\10207815\*.*
-call copy ..\policyengine\data\%policy_dir%\*.txt \epoc32\release\winscw\urel\Z\private\10207815
-
-call md \epoc32\release\armv5\udeb\Z\private\10207815
-call del /q \epoc32\release\armv5\udeb\Z\private\10207815\*.*
-call copy ..\policyengine\data\%policy_dir%\*.txt \epoc32\release\armv5\udeb\Z\private\10207815
-
-call md \epoc32\release\armv5\urel\Z\private\10207815
-call del /q \epoc32\release\armv5\urel\Z\private\10207815\*.*
-call copy ..\policyengine\data\%policy_dir%\*.txt \epoc32\release\armv5\urel\Z\private\10207815
-
-)
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/0000000257.txt
--- a/policymanagement/policyengine/Data/0000000257.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<NativePolicySet NativePolicySetId="root_element" NativePolicyCombiningAlgId="Nativeurn:oasis:names:tc:xacml:1.0:policy-combining-algorithm:deny-overrides"></NativePolicySet>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/10207815.txt
Binary file policymanagement/policyengine/Data/10207815.txt has changed
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/10207816.txt
Binary file policymanagement/policyengine/Data/10207816.txt has changed
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/RootIni/0000000257.txt
--- a/policymanagement/policyengine/Data/RootIni/0000000257.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<NativePolicySet NativePolicySetId="root_element" NativePolicyCombiningAlgId="Nativeurn:oasis:names:tc:xacml:1.0:policy-combining-algorithm:deny-overrides"></NativePolicySet>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/RootIni/10207815.txt
Binary file policymanagement/policyengine/Data/RootIni/10207815.txt has changed
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/RootIni/10207816.txt
Binary file policymanagement/policyengine/Data/RootIni/10207816.txt has changed
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/centrepini/10207815.txt
Binary file policymanagement/policyengine/Data/centrepini/10207815.txt has changed
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000000257.txt
--- a/policymanagement/policyengine/Data/policies/0000000257.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ps psid="root_element" pcid="pdor">|535|768|1281|10497|11777</ps>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000000535.txt
--- a/policymanagement/policyengine/Data/policies/0000000535.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<desc>Root element of policy system.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000000768.txt
--- a/policymanagement/policyengine/Data/policies/0000000768.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<po poid="cert_mapping_policy" rcaid="rpor">|1047</po>~257
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000001047.txt
--- a/policymanagement/policyengine/Data/policies/0000001047.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<desc>Certificate mapping policy. Policy contains certificate mappings.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000001281.txt
--- a/policymanagement/policyengine/Data/policies/0000001281.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ps psid="action_policy_set" pcid="ppor">|1559|1793|9728</ps>~257
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000001559.txt
--- a/policymanagement/policyengine/Data/policies/0000001559.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<desc>Action policy set policies.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000001793.txt
--- a/policymanagement/policyengine/Data/policies/0000001793.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ps psid="settings_policy_set" pcid="ppor">|2071|2304|3072|3840|4608|5376|6144|6912|7936|8960</ps>~1281
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000002071.txt
--- a/policymanagement/policyengine/Data/policies/0000002071.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<desc>Settings policy set policies.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000002304.txt
--- a/policymanagement/policyengine/Data/policies/0000002304.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<po poid="email_enforcement_policy" rcaid="rpor">|2583<ta><res><re><rm mid="seid"> <av dt= "str">EMailEnforcement</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|2836</po>~1793
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000002583.txt
--- a/policymanagement/policyengine/Data/policies/0000002583.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<desc>Email enforcement policy. This policy is used for enforcing email settings.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000002836.txt
--- a/policymanagement/policyengine/Data/policies/0000002836.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="email_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~2304
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000003072.txt
--- a/policymanagement/policyengine/Data/policies/0000003072.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<po poid="syncml_enforcement_policy" rcaid="rpor">|3351<ta><res><re><rm mid="seid"> <av dt= "str">SyncMLEnforcement</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|3604</po>~1793
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000003351.txt
--- a/policymanagement/policyengine/Data/policies/0000003351.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<desc>Email enforcement policy. This policy is used for enforcing SyncML settings.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000003604.txt
--- a/policymanagement/policyengine/Data/policies/0000003604.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="syncml_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~3072
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000003840.txt
--- a/policymanagement/policyengine/Data/policies/0000003840.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<po poid="datasync_enforcement_policy" rcaid="rpor">|4119<ta><res><re><rm mid="seid"> <av dt= "str">DataSyncEnforcement</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|4372</po>~1793
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000004119.txt
--- a/policymanagement/policyengine/Data/policies/0000004119.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<desc>Email enforcement policy. This policy is used for enforcing DataSync settings.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000004372.txt
--- a/policymanagement/policyengine/Data/policies/0000004372.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="datasync_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~3840
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000004608.txt
--- a/policymanagement/policyengine/Data/policies/0000004608.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<po poid="ap_enforcement_policy" rcaid="rpor">|4887<ta><res><re><rm mid="seid"> <av dt= "str">AccessPointEnforcement</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|5140</po>~1793
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000004887.txt
--- a/policymanagement/policyengine/Data/policies/0000004887.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<desc>Access point enforcement policy. This policy is used for enforcing access point settings.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000005140.txt
--- a/policymanagement/policyengine/Data/policies/0000005140.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="ap_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~4608
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000005376.txt
--- a/policymanagement/policyengine/Data/policies/0000005376.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<po poid="wlan_enforcement_policy" rcaid="rpor">|5655<ta><res><re><rm mid="seid"> <av dt= "str">WLANEnforcement</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|5908</po>~1793
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000005655.txt
--- a/policymanagement/policyengine/Data/policies/0000005655.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<desc>WLAN enforcement policy. This policy is used for enforcing WLAN settings.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000005908.txt
--- a/policymanagement/policyengine/Data/policies/0000005908.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="wlan_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~5376
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000006144.txt
--- a/policymanagement/policyengine/Data/policies/0000006144.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<po poid="im_enforcement_policy" rcaid="rpor">|6423<ta><res><re><rm mid="seid"> <av dt= "str">InstantMessagingEnforcemnt</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|6676</po>~1793
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000006423.txt
--- a/policymanagement/policyengine/Data/policies/0000006423.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<desc>Instant messaging policy. This policy is used for instant messaging settings.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000006676.txt
--- a/policymanagement/policyengine/Data/policies/0000006676.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="im_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~6144
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000006912.txt
--- a/policymanagement/policyengine/Data/policies/0000006912.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<po poid="application_management_enforcement_policy" rcaid="rpor">|7191<ta><res><re><rm mid="seid"> <av dt= "str">ApplicationManagement</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|7444|7700</po>~1793
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000007191.txt
--- a/policymanagement/policyengine/Data/policies/0000007191.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<desc>Application Management enforcement policy. This policy is used for enforcing Application Management.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000007444.txt
--- a/policymanagement/policyengine/Data/policies/0000007444.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="application_management_enforcement_policy_rule1" ef="pe"><ta /></ru>~6912
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000007700.txt
--- a/policymanagement/policyengine/Data/policies/0000007700.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="application_management_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~6912
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000007936.txt
--- a/policymanagement/policyengine/Data/policies/0000007936.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<po poid="customization_management_enforcement_policy" rcaid="rpor">|8215<ta><res><re><rm mid="seid"> <av dt= "str">CustomizationManagement</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|8468|8724</po>~1793
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000008215.txt
--- a/policymanagement/policyengine/Data/policies/0000008215.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<desc>Customization Management enforcement policy. This policy is used for enforcing Customization Management.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000008468.txt
--- a/policymanagement/policyengine/Data/policies/0000008468.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="customization_management_enforcement_policy_rule1" ef="pe"><ta /></ru>~7936
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000008724.txt
--- a/policymanagement/policyengine/Data/policies/0000008724.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="customization_management_enforcement_policy_permanent" ef="de"><ta /></ru>~7936
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000008960.txt
--- a/policymanagement/policyengine/Data/policies/0000008960.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<po poid="dcmo_enforcement_policy" rcaid="rpor">|9239<ta><res><re><rm mid="seid"> <av dt= "str">DCMOEnforcement</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|9492</po>~1793
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000009239.txt
--- a/policymanagement/policyengine/Data/policies/0000009239.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<desc>DCMO policy. This policy is used for DCMO settings.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000009492.txt
--- a/policymanagement/policyengine/Data/policies/0000009492.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="dcmo_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~8960
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000009728.txt
--- a/policymanagement/policyengine/Data/policies/0000009728.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<po poid="terminal_security_management_enforcement_policy" rcaid="rpor">|10007<ta><res><re><rm mid="seid"> <av dt= "str">TerminalSecurityManagement</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|10260</po>~1281
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000010007.txt
--- a/policymanagement/policyengine/Data/policies/0000010007.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<desc>Terminal control enforcement policy. This policy is used for enforcing Terminal Control.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000010260.txt
--- a/policymanagement/policyengine/Data/policies/0000010260.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="terminal_security_management_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~9728
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000010497.txt
--- a/policymanagement/policyengine/Data/policies/0000010497.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ps psid="terminal_security_policy_set" pcid="ppor">|10752|11264</ps>~257
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000010752.txt
--- a/policymanagement/policyengine/Data/policies/0000010752.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<po poid="device_lock_passcode_visibility_policy" rcaid="rdor"><ta><res><re><rm mid="seid"> <av dt= "str">DeviceLockPasscodeVisibility</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|11028</po>~10497
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000011028.txt
--- a/policymanagement/policyengine/Data/policies/0000011028.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="device_lock_passcode_visibility_policy_rule1" ef="pe"><ta /></ru>~10752
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000011264.txt
--- a/policymanagement/policyengine/Data/policies/0000011264.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<po poid="thirdparty_secure_ids_policy" rcaid="rpor"><ta><res><re><rm mid="seid"> <av dt= "str">ThirdPartySecureIds</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|11540</po>~10497
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000011540.txt
--- a/policymanagement/policyengine/Data/policies/0000011540.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="thirdparty_secure_ids_policy_permanent_rule1" ef="de"><ta /></ru>~11264
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000011777.txt
--- a/policymanagement/policyengine/Data/policies/0000011777.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ps psid="meta_policy_set" pcid="ppor">|12055|12288|13057</ps>~257
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000012055.txt
--- a/policymanagement/policyengine/Data/policies/0000012055.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<desc>Meta policy set policies.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000012288.txt
--- a/policymanagement/policyengine/Data/policies/0000012288.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<po poid="certificate_mapping_rights_policy" rcaid="rpor">|12567|12820</po>~11777
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000012567.txt
--- a/policymanagement/policyengine/Data/policies/0000012567.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<desc>This policy defines who has rights to modify certificate mapping policies. Currentlyonly certificate owner can edit mapping rules!</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000012820.txt
--- a/policymanagement/policyengine/Data/policies/0000012820.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="certificate_mapping_rights_policy_rule1" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">cert_mapping_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta><con><app fid="orid"><app fid="seid"><sa aid="trusted_subject" dt="str"/><sa aid="target_trusted_subject" dt="str"/></app><app fid="seid"><sa aid="trusted_subject" dt="str"/><sa aid="mapped_certificate_id" dt="str"/></app></app></con></ru>~12288
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000013057.txt
--- a/policymanagement/policyengine/Data/policies/0000013057.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ps psid="trustedadmin_meta_policy_set" pcid="ppor">|13335|13568|14080|15104|18432</ps>~11777
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000013335.txt
--- a/policymanagement/policyengine/Data/policies/0000013335.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<desc>Trustedadmin meta policy set policies.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000013568.txt
--- a/policymanagement/policyengine/Data/policies/0000013568.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<po poid="roles_mapping_policy" rcaid="rpor">|13847</po>~13057
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000013847.txt
--- a/policymanagement/policyengine/Data/policies/0000013847.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<desc>Roles policy. This metapolicy is used for controlling roles in policy system.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000014080.txt
--- a/policymanagement/policyengine/Data/policies/0000014080.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<po poid="initial_trustedadmin_policy" rcaid="rpor">|14359|14612|14868</po>~13057
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000014359.txt
--- a/policymanagement/policyengine/Data/policies/0000014359.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<desc>Initial trustedadmin Policy. This policy grants trustedadmin Policy Rights to trustedadmin. This is requested from user.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000014612.txt
--- a/policymanagement/policyengine/Data/policies/0000014612.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="initial_trustedadmin_policy_rule1" ef="pe"><ta><acs><ac><am mid="seid"> <av dt= "str">add</av> <aa aid="urn:oasis:names:tc:xacml:1.0:action:action-id" dt="str"/> </am></ac></acs><res><re><rm mid="seid"> <av dt= "str">roles_mapping_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta><con><app fid="andid"><app fid="uaicpid"><sa aid="target_trusted_subject" dt="str"/></app><app fid="csid"></app><app fid="rtsid"><av dt= "str">subject</av><av dt= "str">trusted_subject</av><av dt= "str">any</av><av dt= "str">subject</av><av dt= "str">urn:nokia:names:s60:corporate:1.0:subject:role_id</av><av dt= "str">trustedadmin</av></app></app></con></ru>~14080
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000014868.txt
--- a/policymanagement/policyengine/Data/policies/0000014868.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="initial_trustedadmin_policy_rule2" ef="pe"><ta><sus><su><sm mid="trm"> <av dt= "str">trustedadmin</av> <sa aid="urn:nokia:names:s60:corporate:1.0:subject:role_id" dt="str"/> </sm></su></sus><acs><ac><am mid="seid"> <av dt= "str">remove</av> <aa aid="urn:oasis:names:tc:xacml:1.0:action:action-id" dt="str"/> </am></ac></acs><res><re><rm mid="seid"> <av dt= "str">roles_mapping_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~14080
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000015104.txt
--- a/policymanagement/policyengine/Data/policies/0000015104.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<po poid="trustedadmin_meta_policy" rcaid="rpor">|15383<ta><sus><su><sm mid="trm"> <av dt= "str">trustedadmin</av> <sa aid="urn:nokia:names:s60:corporate:1.0:subject:role_id" dt="str"/> </sm></su></sus><acs><ac><am mid="seid"> <av dt= "str">add</av> <aa aid="urn:oasis:names:tc:xacml:1.0:action:action-id" dt="str"/> </am></ac><ac><am mid="seid"> <av dt= "str">remove</av> <aa aid="urn:oasis:names:tc:xacml:1.0:action:action-id" dt="str"/> </am></ac><ac><am mid="seid"> <av dt= "str">replace</av> <aa aid="urn:oasis:names:tc:xacml:1.0:action:action-id" dt="str"/> </am></ac></acs></ta>|15636|15892|16148|16404|16660|16916|17172|17428|17684|17940|18196</po>~13057
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000015383.txt
--- a/policymanagement/policyengine/Data/policies/0000015383.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<desc>trustedadmin Meta Policy. This metapolicy is used for controlling enforcement policies in policy system.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000015636.txt
--- a/policymanagement/policyengine/Data/policies/0000015636.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="trustedadmin_meta_policy_rule1" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">wlan_enforcement_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~15104
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000015892.txt
--- a/policymanagement/policyengine/Data/policies/0000015892.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="trustedadmin_meta_policy_rule2" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">datasync_enforcement_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~15104
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000016148.txt
--- a/policymanagement/policyengine/Data/policies/0000016148.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="trustedadmin_meta_policy_rule3" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">syncml_enforcement_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~15104
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000016404.txt
--- a/policymanagement/policyengine/Data/policies/0000016404.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="trustedadmin_meta_policy_rule4" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">email_enforcement_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~15104
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000016660.txt
--- a/policymanagement/policyengine/Data/policies/0000016660.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="trustedadmin_meta_policy_rule5" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">im_enforcement_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~15104
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000016916.txt
--- a/policymanagement/policyengine/Data/policies/0000016916.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="trustedadmin_meta_policy_rule6" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">ap_enforcement_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~15104
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000017172.txt
--- a/policymanagement/policyengine/Data/policies/0000017172.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="trustedadmin_meta_policy_rule7" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">customization_management_enforcement_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~15104
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000017428.txt
--- a/policymanagement/policyengine/Data/policies/0000017428.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="trustedadmin_meta_policy_rule8" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">application_management_enforcement_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~15104
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000017684.txt
--- a/policymanagement/policyengine/Data/policies/0000017684.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="trustedadmin_meta_policy_rule9" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">terminal_security_management_enforcement_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~15104
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000017940.txt
--- a/policymanagement/policyengine/Data/policies/0000017940.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="trustedadmin_meta_policy_rule10" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">thirdparty_secure_ids_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~15104
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000018196.txt
--- a/policymanagement/policyengine/Data/policies/0000018196.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="trustedadmin_meta_policy_rule11" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">dcmo_enforcement_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~15104
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000018432.txt
--- a/policymanagement/policyengine/Data/policies/0000018432.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<po poid="application_meta_policy" rcaid="rpor">|18711<ta><acs><ac><am mid="seid"> <av dt= "str">add</av> <aa aid="urn:oasis:names:tc:xacml:1.0:action:action-id" dt="str"/> </am></ac><ac><am mid="seid"> <av dt= "str">remove</av> <aa aid="urn:oasis:names:tc:xacml:1.0:action:action-id" dt="str"/> </am></ac><ac><am mid="seid"> <av dt= "str">replace</av> <aa aid="urn:oasis:names:tc:xacml:1.0:action:action-id" dt="str"/> </am></ac></acs></ta>|18964</po>~13057
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000018711.txt
--- a/policymanagement/policyengine/Data/policies/0000018711.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<desc>Application Meta Policy. This metapolicy is used for giving policy modifing right for applications.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies/0000018964.txt
--- a/policymanagement/policyengine/Data/policies/0000018964.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="application_meta_policy_rule1" ef="pe"><ta><sus><su><sm mid="seid"> <av dt= "str">SECUREID[10207836]</av> <sa aid="urn:oasis:names:tc:xacml:1.0:subject:subject-id" dt="str"/> </sm></su></sus><res><re><rm mid="seid"> <av dt= "str">device_lock_passcode_visibility_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~18432
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000000257.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000000257.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ps psid="root_element" pcid="pdor">|535|768|1281|9729|13569</ps>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000000535.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000000535.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<desc>Root element of policy system.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000000768.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000000768.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<po poid="cert_mapping_policy" rcaid="rpor">|1047</po>~257
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000001047.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000001047.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<desc>Certificate mapping policy. Policy contains certificate mappings.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000001281.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000001281.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ps psid="action_policy_set" pcid="ppor">|1559|1793|8960</ps>~257
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000001559.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000001559.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<desc>Action policy set policies.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000001793.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000001793.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ps psid="settings_policy_set" pcid="ppor">|2071|2304|3072|3840|4608|5376|6144|6912|7936</ps>~1281
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000002071.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000002071.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<desc>Settings policy set policies.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000002304.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000002304.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<po poid="email_enforcement_policy" rcaid="rpor">|2583<ta><res><re><rm mid="seid"> <av dt= "str">EMailEnforcement</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|2836</po>~1793
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000002583.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000002583.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<desc>Email enforcement policy. This policy is used for enforcing email settings.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000002836.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000002836.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="email_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~2304
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000003072.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000003072.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<po poid="syncml_enforcement_policy" rcaid="rpor">|3351<ta><res><re><rm mid="seid"> <av dt= "str">SyncMLEnforcement</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|3604</po>~1793
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000003351.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000003351.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<desc>Email enforcement policy. This policy is used for enforcing SyncML settings.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000003604.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000003604.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="syncml_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~3072
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000003840.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000003840.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<po poid="datasync_enforcement_policy" rcaid="rpor">|4119<ta><res><re><rm mid="seid"> <av dt= "str">DataSyncEnforcement</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|4372</po>~1793
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000004119.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000004119.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<desc>Email enforcement policy. This policy is used for enforcing DataSync settings.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000004372.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000004372.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="datasync_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~3840
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000004608.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000004608.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<po poid="ap_enforcement_policy" rcaid="rpor">|4887<ta><res><re><rm mid="seid"> <av dt= "str">AccessPointEnforcement</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|5140</po>~1793
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000004887.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000004887.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<desc>Access point enforcement policy. This policy is used for enforcing access point settings.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000005140.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000005140.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="ap_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~4608
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000005376.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000005376.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<po poid="wlan_enforcement_policy" rcaid="rpor">|5655<ta><res><re><rm mid="seid"> <av dt= "str">WLANEnforcement</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|5908</po>~1793
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000005655.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000005655.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<desc>WLAN enforcement policy. This policy is used for enforcing WLAN settings.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000005908.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000005908.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="wlan_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~5376
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000006144.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000006144.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<po poid="im_enforcement_policy" rcaid="rpor">|6423<ta><res><re><rm mid="seid"> <av dt= "str">InstantMessagingEnforcemnt</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|6676</po>~1793
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000006423.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000006423.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<desc>Instant messaging policy. This policy is used for instant messaging settings.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000006676.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000006676.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="im_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~6144
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000006912.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000006912.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<po poid="application_management_enforcement_policy" rcaid="rpor">|7191<ta><res><re><rm mid="seid"> <av dt= "str">ApplicationManagement</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|7444|7700</po>~1793
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000007191.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000007191.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<desc>Application Management enforcement policy. This policy is used for enforcing Application Management.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000007444.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000007444.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="application_management_enforcement_policy_rule1" ef="pe"><ta /></ru>~6912
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000007700.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000007700.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="application_management_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~6912
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000007936.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000007936.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<po poid="customization_management_enforcement_policy" rcaid="rpor">|8215<ta><res><re><rm mid="seid"> <av dt= "str">CustomizationManagement</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|8468|8724</po>~1793
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000008215.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000008215.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<desc>Customization Management enforcement policy. This policy is used for enforcing Customization Management.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000008468.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000008468.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="customization_management_enforcement_policy_rule1" ef="pe"><ta /></ru>~7936
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000008724.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000008724.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="customization_management_enforcement_policy_permanent" ef="de"><ta /></ru>~7936
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000008960.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000008960.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<po poid="terminal_security_management_enforcement_policy" rcaid="rpor">|9239<ta><res><re><rm mid="seid"> <av dt= "str">TerminalSecurityManagement</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|9492</po>~1281
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000009239.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000009239.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<desc>Terminal control enforcement policy. This policy is used for enforcing Terminal Control.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000009492.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000009492.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="terminal_security_management_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~8960
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000009729.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000009729.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ps psid="terminal_security_policy_set" pcid="ppor">|9984|10496</ps>~257
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000009984.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000009984.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<po poid="device_lock_passcode_visibility_policy" rcaid="rdor"><ta><res><re><rm mid="seid"> <av dt= "str">DeviceLockPasscodeVisibility</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|10260</po>~9729
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000010260.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000010260.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="device_lock_passcode_visibility_policy_rule1" ef="pe"><ta /></ru>~9984
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000010496.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000010496.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<po poid="thirdparty_secure_ids_policy" rcaid="rpor"><ta><res><re><rm mid="seid"> <av dt= "str">ThirdPartySecureIds</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|10772|11028|11284|11540|11796|12052|12308|12564|12820|13076|13332</po>~9729
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000010772.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000010772.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="thirdparty_secure_ids_policy_permanent_rule1" ef="de"><ta /></ru>~10496
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000011028.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000011028.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="thirdparty_secure_ids_policy_permanent_rule2" ef="pe"><ta><sus><su><sm mid="seid"> <av dt= "str">SECUREID[10206970]</av> <sa aid="urn:oasis:names:tc:xacml:1.0:subject:subject-id" dt="str"/> </sm></su></sus></ta></ru>~10496
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000011284.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000011284.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="thirdparty_secure_ids_policy_permanent_rule3" ef="pe"><ta><sus><su><sm mid="seid"> <av dt= "str">SECUREID[1027370C]</av> <sa aid="urn:oasis:names:tc:xacml:1.0:subject:subject-id" dt="str"/> </sm></su></sus></ta></ru>~10496
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000011540.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000011540.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="thirdparty_secure_ids_policy_permanent_rule4" ef="pe"><ta><sus><su><sm mid="seid"> <av dt= "str">SECUREID[10206802]</av> <sa aid="urn:oasis:names:tc:xacml:1.0:subject:subject-id" dt="str"/> </sm></su></sus></ta></ru>~10496
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000011796.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000011796.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="thirdparty_secure_ids_policy_permanent_rule5" ef="pe"><ta><sus><su><sm mid="seid"> <av dt= "str">SECUREID[10206970]</av> <sa aid="urn:oasis:names:tc:xacml:1.0:subject:subject-id" dt="str"/> </sm></su></sus></ta></ru>~10496
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000012052.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000012052.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="thirdparty_secure_ids_policy_permanent_rule6" ef="pe"><ta><sus><su><sm mid="seid"> <av dt= "str">SECUREID[20002CF9]</av> <sa aid="urn:oasis:names:tc:xacml:1.0:subject:subject-id" dt="str"/> </sm></su></sus></ta></ru>~10496
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000012308.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000012308.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="thirdparty_secure_ids_policy_permanent_rule7" ef="pe"><ta><sus><su><sm mid="seid"> <av dt= "str">SECUREID[20002CFA]</av> <sa aid="urn:oasis:names:tc:xacml:1.0:subject:subject-id" dt="str"/> </sm></su></sus></ta></ru>~10496
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000012564.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000012564.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="thirdparty_secure_ids_policy_permanent_rule8" ef="pe"><ta><sus><su><sm mid="seid"> <av dt= "str">SECUREID[20002CFB]</av> <sa aid="urn:oasis:names:tc:xacml:1.0:subject:subject-id" dt="str"/> </sm></su></sus></ta></ru>~10496
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000012820.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000012820.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="thirdparty_secure_ids_policy_permanent_rule9" ef="pe"><ta><sus><su><sm mid="seid"> <av dt= "str">SECUREID[20002CFC]</av> <sa aid="urn:oasis:names:tc:xacml:1.0:subject:subject-id" dt="str"/> </sm></su></sus></ta></ru>~10496
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000013076.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000013076.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="thirdparty_secure_ids_policy_permanent_rule10" ef="pe"><ta><sus><su><sm mid="seid"> <av dt= "str">SECUREID[20002CFD]</av> <sa aid="urn:oasis:names:tc:xacml:1.0:subject:subject-id" dt="str"/> </sm></su></sus></ta></ru>~10496
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000013332.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000013332.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="thirdparty_secure_ids_policy_permanent_rule11" ef="pe"><ta><sus><su><sm mid="seid"> <av dt= "str">SECUREID[20001D6A]</av> <sa aid="urn:oasis:names:tc:xacml:1.0:subject:subject-id" dt="str"/> </sm></su></sus></ta></ru>~10496
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000013569.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000013569.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ps psid="meta_policy_set" pcid="ppor">|13847|14080|14849</ps>~257
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000013847.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000013847.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<desc>Meta policy set policies.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000014080.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000014080.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<po poid="certificate_mapping_rights_policy" rcaid="rpor">|14359|14612</po>~13569
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000014359.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000014359.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<desc>This policy defines who has rights to modify certificate mapping policies. Currentlyonly certificate owner can edit mapping rules!</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000014612.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000014612.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="certificate_mapping_rights_policy_rule1" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">cert_mapping_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta><con><app fid="seid"><sa aid="trusted_subject" dt="str"/><sa aid="target_trusted_subject" dt="str"/></app></con></ru>~14080
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000014849.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000014849.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ps psid="trustedadmin_meta_policy_set" pcid="ppor">|15127|15360|15872|16896|19968</ps>~13569
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000015127.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000015127.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<desc>Trustedadmin meta policy set policies.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000015360.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000015360.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<po poid="roles_mapping_policy" rcaid="rpor">|15639</po>~14849
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000015639.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000015639.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<desc>Roles policy. This metapolicy is used for controlling roles in policy system.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000015872.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000015872.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<po poid="initial_trustedadmin_policy" rcaid="rpor">|16151|16404|16660</po>~14849
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000016151.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000016151.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<desc>Initial trustedadmin Policy. This policy grants trustedadmin Policy Rights to trustedadmin. This is requested from user.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000016404.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000016404.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="initial_trustedadmin_policy_rule1" ef="pe"><ta><acs><ac><am mid="seid"> <av dt= "str">add</av> <aa aid="urn:oasis:names:tc:xacml:1.0:action:action-id" dt="str"/> </am></ac></acs><res><re><rm mid="seid"> <av dt= "str">roles_mapping_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta><con><app fid="andid"><app fid="uaicpid"><sa aid="target_trusted_subject" dt="str"/></app><app fid="csid"></app><app fid="rtsid"><av dt= "str">subject</av><av dt= "str">trusted_subject</av><av dt= "str">any</av><av dt= "str">subject</av><av dt= "str">urn:nokia:names:s60:corporate:1.0:subject:role_id</av><av dt= "str">trustedadmin</av></app></app></con></ru>~15872
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000016660.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000016660.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="initial_trustedadmin_policy_rule2" ef="pe"><ta><acs><ac><am mid="seid"> <av dt= "str">remove</av> <aa aid="urn:oasis:names:tc:xacml:1.0:action:action-id" dt="str"/> </am></ac></acs><res><re><rm mid="seid"> <av dt= "str">roles_mapping_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta><con><app fid="andid"><app fid="csid"></app><app fid="rtsid"><av dt= "str">subject</av><av dt= "str">trusted_subject</av><av dt= "str">any</av><av dt= "str">subject</av><av dt= "str">urn:nokia:names:s60:corporate:1.0:subject:role_id</av><av dt= "str">trustedadmin</av></app></app></con></ru>~15872
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000016896.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000016896.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<po poid="trustedadmin_meta_policy" rcaid="rpor">|17175<ta><sus><su><sm mid="trm"> <av dt= "str">trustedadmin</av> <sa aid="urn:nokia:names:s60:corporate:1.0:subject:role_id" dt="str"/> </sm></su></sus><acs><ac><am mid="seid"> <av dt= "str">add</av> <aa aid="urn:oasis:names:tc:xacml:1.0:action:action-id" dt="str"/> </am></ac><ac><am mid="seid"> <av dt= "str">remove</av> <aa aid="urn:oasis:names:tc:xacml:1.0:action:action-id" dt="str"/> </am></ac><ac><am mid="seid"> <av dt= "str">replace</av> <aa aid="urn:oasis:names:tc:xacml:1.0:action:action-id" dt="str"/> </am></ac></acs></ta>|17428|17684|17940|18196|18452|18708|18964|19220|19476|19732</po>~14849
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000017175.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000017175.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<desc>trustedadmin Meta Policy. This metapolicy is used for controlling enforcement policies in policy system.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000017428.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000017428.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="trustedadmin_meta_policy_rule1" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">wlan_enforcement_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~16896
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000017684.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000017684.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="trustedadmin_meta_policy_rule2" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">datasync_enforcement_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~16896
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000017940.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000017940.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="trustedadmin_meta_policy_rule3" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">syncml_enforcement_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~16896
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000018196.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000018196.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="trustedadmin_meta_policy_rule4" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">email_enforcement_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~16896
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000018452.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000018452.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="trustedadmin_meta_policy_rule5" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">im_enforcement_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~16896
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000018708.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000018708.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="trustedadmin_meta_policy_rule6" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">ap_enforcement_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~16896
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000018964.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000018964.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="trustedadmin_meta_policy_rule7" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">customization_management_enforcement_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~16896
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000019220.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000019220.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="trustedadmin_meta_policy_rule8" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">application_management_enforcement_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~16896
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000019476.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000019476.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="trustedadmin_meta_policy_rule9" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">terminal_security_management_enforcement_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~16896
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000019732.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000019732.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="trustedadmin_meta_policy_rule10" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">thirdparty_secure_ids_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~16896
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000019968.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000019968.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<po poid="application_meta_policy" rcaid="rpor">|20247<ta><acs><ac><am mid="seid"> <av dt= "str">add</av> <aa aid="urn:oasis:names:tc:xacml:1.0:action:action-id" dt="str"/> </am></ac><ac><am mid="seid"> <av dt= "str">remove</av> <aa aid="urn:oasis:names:tc:xacml:1.0:action:action-id" dt="str"/> </am></ac><ac><am mid="seid"> <av dt= "str">replace</av> <aa aid="urn:oasis:names:tc:xacml:1.0:action:action-id" dt="str"/> </am></ac></acs></ta>|20500</po>~14849
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000020247.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000020247.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<desc>Application Meta Policy. This metapolicy is used for giving policy modifing right for applications.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/Data/policies_apollo30/0000020500.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000020500.txt	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<ru ruid="application_meta_policy_rule1" ef="pe"><ta><sus><su><sm mid="seid"> <av dt= "str">SECUREID[10207836]</av> <sa aid="urn:oasis:names:tc:xacml:1.0:subject:subject-id" dt="str"/> </sm></su></sus><res><re><rm mid="seid"> <av dt= "str">device_lock_passcode_visibility_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~19968
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/group/bld.inf
--- a/policymanagement/policyengine/group/bld.inf	Mon Mar 08 21:44:11 2010 +0000
+++ b/policymanagement/policyengine/group/bld.inf	Sun Mar 14 13:12:06 2010 +0000
@@ -21,19 +21,11 @@
 
 PRJ_EXPORTS
 
-../rom/10207815.txt /epoc32/data/z/private/10202be9/10207815.txt
-../rom/10207816.txt /epoc32/data/z/private/10202be9/10207816.txt
-../rom/10207815.txt /epoc32/release/winscw/udeb/z/private/10202be9/10207815.txt
-../rom/10207816.txt /epoc32/release/winscw/udeb/z/private/10202be9/10207816.txt
-../rom/10207815.txt /epoc32/release/winscw/urel/z/private/10202be9/10207815.txt
-../rom/10207816.txt /epoc32/release/winscw/urel/z/private/10202be9/10207816.txt
-
 ../PMRfsPlugin/scripts/format_e_.txt /epoc32/release/winscw/udeb/z/private/1020783f/format_e_.txt
 ../PMRfsPlugin/scripts/format_e_.txt /epoc32/release/winscw/urel/z/private/1020783f/format_e_.txt
 ../PMRfsPlugin/scripts/format_e_.txt /epoc32/release/armv5/udeb/z/private/1020783f/format_e_.txt
 ../PMRfsPlugin/scripts/format_e_.txt /epoc32/release/armv5/urel/z/private/1020783f/format_e_.txt
 
-../rom/pe_data.iby														CORE_MW_LAYER_IBY_EXPORT_PATH(pe_data_s60.iby)
 ../rom/policyengine.iby												CORE_MW_LAYER_IBY_EXPORT_PATH(policyengine.iby)
 ../rom/policyengineresources.iby							LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(policyengineresources.iby)
 ../policyengineui/loc/PolicyEngineUI.loc			MW_LAYER_LOC_EXPORT_PATH(policyengineui.loc)
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/0000000257.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/0000000257.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<NativePolicySet NativePolicySetId="root_element" NativePolicyCombiningAlgId="Nativeurn:oasis:names:tc:xacml:1.0:policy-combining-algorithm:deny-overrides"></NativePolicySet>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/10207815.txt
Binary file policymanagement/policyengine/policyenginepolicies/data/10207815.txt has changed
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/10207816.txt
Binary file policymanagement/policyengine/policyenginepolicies/data/10207816.txt has changed
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/RootIni/0000000257.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/RootIni/0000000257.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<NativePolicySet NativePolicySetId="root_element" NativePolicyCombiningAlgId="Nativeurn:oasis:names:tc:xacml:1.0:policy-combining-algorithm:deny-overrides"></NativePolicySet>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/RootIni/10207815.txt
Binary file policymanagement/policyengine/policyenginepolicies/data/RootIni/10207815.txt has changed
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/RootIni/10207816.txt
Binary file policymanagement/policyengine/policyenginepolicies/data/RootIni/10207816.txt has changed
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/centrepini/10207815.txt
Binary file policymanagement/policyengine/policyenginepolicies/data/centrepini/10207815.txt has changed
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000000257.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000000257.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ps psid="root_element" pcid="pdor">|535|768|1281|10497|11777</ps>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000000535.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000000535.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<desc>Root element of policy system.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000000768.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000000768.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<po poid="cert_mapping_policy" rcaid="rpor">|1047</po>~257
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000001047.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000001047.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<desc>Certificate mapping policy. Policy contains certificate mappings.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000001281.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000001281.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ps psid="action_policy_set" pcid="ppor">|1559|1793|9728</ps>~257
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000001559.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000001559.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<desc>Action policy set policies.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000001793.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000001793.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ps psid="settings_policy_set" pcid="ppor">|2071|2304|3072|3840|4608|5376|6144|6912|7936|8960</ps>~1281
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000002071.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000002071.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<desc>Settings policy set policies.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000002304.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000002304.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<po poid="email_enforcement_policy" rcaid="rpor">|2583<ta><res><re><rm mid="seid"> <av dt= "str">EMailEnforcement</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|2836</po>~1793
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000002583.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000002583.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<desc>Email enforcement policy. This policy is used for enforcing email settings.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000002836.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000002836.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="email_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~2304
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000003072.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000003072.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<po poid="syncml_enforcement_policy" rcaid="rpor">|3351<ta><res><re><rm mid="seid"> <av dt= "str">SyncMLEnforcement</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|3604</po>~1793
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000003351.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000003351.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<desc>Email enforcement policy. This policy is used for enforcing SyncML settings.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000003604.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000003604.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="syncml_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~3072
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000003840.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000003840.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<po poid="datasync_enforcement_policy" rcaid="rpor">|4119<ta><res><re><rm mid="seid"> <av dt= "str">DataSyncEnforcement</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|4372</po>~1793
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000004119.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000004119.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<desc>Email enforcement policy. This policy is used for enforcing DataSync settings.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000004372.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000004372.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="datasync_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~3840
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000004608.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000004608.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<po poid="ap_enforcement_policy" rcaid="rpor">|4887<ta><res><re><rm mid="seid"> <av dt= "str">AccessPointEnforcement</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|5140</po>~1793
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000004887.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000004887.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<desc>Access point enforcement policy. This policy is used for enforcing access point settings.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000005140.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000005140.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="ap_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~4608
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000005376.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000005376.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<po poid="wlan_enforcement_policy" rcaid="rpor">|5655<ta><res><re><rm mid="seid"> <av dt= "str">WLANEnforcement</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|5908</po>~1793
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000005655.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000005655.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<desc>WLAN enforcement policy. This policy is used for enforcing WLAN settings.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000005908.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000005908.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="wlan_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~5376
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000006144.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000006144.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<po poid="im_enforcement_policy" rcaid="rpor">|6423<ta><res><re><rm mid="seid"> <av dt= "str">InstantMessagingEnforcemnt</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|6676</po>~1793
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000006423.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000006423.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<desc>Instant messaging policy. This policy is used for instant messaging settings.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000006676.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000006676.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="im_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~6144
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000006912.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000006912.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<po poid="application_management_enforcement_policy" rcaid="rpor">|7191<ta><res><re><rm mid="seid"> <av dt= "str">ApplicationManagement</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|7444|7700</po>~1793
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000007191.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000007191.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<desc>Application Management enforcement policy. This policy is used for enforcing Application Management.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000007444.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000007444.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="application_management_enforcement_policy_rule1" ef="pe"><ta /></ru>~6912
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000007700.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000007700.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="application_management_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~6912
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000007936.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000007936.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<po poid="customization_management_enforcement_policy" rcaid="rpor">|8215<ta><res><re><rm mid="seid"> <av dt= "str">CustomizationManagement</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|8468|8724</po>~1793
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000008215.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000008215.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<desc>Customization Management enforcement policy. This policy is used for enforcing Customization Management.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000008468.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000008468.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="customization_management_enforcement_policy_rule1" ef="pe"><ta /></ru>~7936
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000008724.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000008724.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="customization_management_enforcement_policy_permanent" ef="de"><ta /></ru>~7936
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000008960.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000008960.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<po poid="dcmo_enforcement_policy" rcaid="rpor">|9239<ta><res><re><rm mid="seid"> <av dt= "str">DCMOEnforcement</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|9492</po>~1793
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000009239.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000009239.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<desc>DCMO policy. This policy is used for DCMO settings.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000009492.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000009492.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="dcmo_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~8960
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000009728.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000009728.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<po poid="terminal_security_management_enforcement_policy" rcaid="rpor">|10007<ta><res><re><rm mid="seid"> <av dt= "str">TerminalSecurityManagement</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|10260</po>~1281
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000010007.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000010007.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<desc>Terminal control enforcement policy. This policy is used for enforcing Terminal Control.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000010260.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000010260.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="terminal_security_management_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~9728
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000010497.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000010497.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ps psid="terminal_security_policy_set" pcid="ppor">|10752|11264</ps>~257
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000010752.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000010752.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<po poid="device_lock_passcode_visibility_policy" rcaid="rdor"><ta><res><re><rm mid="seid"> <av dt= "str">DeviceLockPasscodeVisibility</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|11028</po>~10497
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000011028.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000011028.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="device_lock_passcode_visibility_policy_rule1" ef="pe"><ta /></ru>~10752
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000011264.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000011264.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<po poid="thirdparty_secure_ids_policy" rcaid="rpor"><ta><res><re><rm mid="seid"> <av dt= "str">ThirdPartySecureIds</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|11540</po>~10497
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000011540.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000011540.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="thirdparty_secure_ids_policy_permanent_rule1" ef="de"><ta /></ru>~11264
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000011777.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000011777.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ps psid="meta_policy_set" pcid="ppor">|12055|12288|13057</ps>~257
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000012055.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000012055.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<desc>Meta policy set policies.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000012288.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000012288.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<po poid="certificate_mapping_rights_policy" rcaid="rpor">|12567|12820</po>~11777
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000012567.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000012567.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<desc>This policy defines who has rights to modify certificate mapping policies. Currentlyonly certificate owner can edit mapping rules!</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000012820.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000012820.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="certificate_mapping_rights_policy_rule1" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">cert_mapping_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta><con><app fid="orid"><app fid="seid"><sa aid="trusted_subject" dt="str"/><sa aid="target_trusted_subject" dt="str"/></app><app fid="seid"><sa aid="trusted_subject" dt="str"/><sa aid="mapped_certificate_id" dt="str"/></app></app></con></ru>~12288
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000013057.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000013057.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ps psid="trustedadmin_meta_policy_set" pcid="ppor">|13335|13568|14080|15104|18432</ps>~11777
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000013335.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000013335.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<desc>Trustedadmin meta policy set policies.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000013568.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000013568.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<po poid="roles_mapping_policy" rcaid="rpor">|13847</po>~13057
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000013847.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000013847.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<desc>Roles policy. This metapolicy is used for controlling roles in policy system.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000014080.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000014080.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<po poid="initial_trustedadmin_policy" rcaid="rpor">|14359|14612|14868</po>~13057
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000014359.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000014359.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<desc>Initial trustedadmin Policy. This policy grants trustedadmin Policy Rights to trustedadmin. This is requested from user.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000014612.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000014612.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="initial_trustedadmin_policy_rule1" ef="pe"><ta><acs><ac><am mid="seid"> <av dt= "str">add</av> <aa aid="urn:oasis:names:tc:xacml:1.0:action:action-id" dt="str"/> </am></ac></acs><res><re><rm mid="seid"> <av dt= "str">roles_mapping_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta><con><app fid="andid"><app fid="uaicpid"><sa aid="target_trusted_subject" dt="str"/></app><app fid="csid"></app><app fid="rtsid"><av dt= "str">subject</av><av dt= "str">trusted_subject</av><av dt= "str">any</av><av dt= "str">subject</av><av dt= "str">urn:nokia:names:s60:corporate:1.0:subject:role_id</av><av dt= "str">trustedadmin</av></app></app></con></ru>~14080
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000014868.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000014868.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="initial_trustedadmin_policy_rule2" ef="pe"><ta><sus><su><sm mid="trm"> <av dt= "str">trustedadmin</av> <sa aid="urn:nokia:names:s60:corporate:1.0:subject:role_id" dt="str"/> </sm></su></sus><acs><ac><am mid="seid"> <av dt= "str">remove</av> <aa aid="urn:oasis:names:tc:xacml:1.0:action:action-id" dt="str"/> </am></ac></acs><res><re><rm mid="seid"> <av dt= "str">roles_mapping_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~14080
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000015104.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000015104.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<po poid="trustedadmin_meta_policy" rcaid="rpor">|15383<ta><sus><su><sm mid="trm"> <av dt= "str">trustedadmin</av> <sa aid="urn:nokia:names:s60:corporate:1.0:subject:role_id" dt="str"/> </sm></su></sus><acs><ac><am mid="seid"> <av dt= "str">add</av> <aa aid="urn:oasis:names:tc:xacml:1.0:action:action-id" dt="str"/> </am></ac><ac><am mid="seid"> <av dt= "str">remove</av> <aa aid="urn:oasis:names:tc:xacml:1.0:action:action-id" dt="str"/> </am></ac><ac><am mid="seid"> <av dt= "str">replace</av> <aa aid="urn:oasis:names:tc:xacml:1.0:action:action-id" dt="str"/> </am></ac></acs></ta>|15636|15892|16148|16404|16660|16916|17172|17428|17684|17940|18196</po>~13057
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000015383.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000015383.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<desc>trustedadmin Meta Policy. This metapolicy is used for controlling enforcement policies in policy system.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000015636.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000015636.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="trustedadmin_meta_policy_rule1" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">wlan_enforcement_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~15104
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000015892.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000015892.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="trustedadmin_meta_policy_rule2" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">datasync_enforcement_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~15104
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000016148.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000016148.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="trustedadmin_meta_policy_rule3" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">syncml_enforcement_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~15104
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000016404.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000016404.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="trustedadmin_meta_policy_rule4" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">email_enforcement_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~15104
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000016660.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000016660.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="trustedadmin_meta_policy_rule5" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">im_enforcement_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~15104
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000016916.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000016916.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="trustedadmin_meta_policy_rule6" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">ap_enforcement_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~15104
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000017172.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000017172.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="trustedadmin_meta_policy_rule7" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">customization_management_enforcement_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~15104
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000017428.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000017428.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="trustedadmin_meta_policy_rule8" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">application_management_enforcement_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~15104
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000017684.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000017684.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="trustedadmin_meta_policy_rule9" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">terminal_security_management_enforcement_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~15104
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000017940.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000017940.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="trustedadmin_meta_policy_rule10" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">thirdparty_secure_ids_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~15104
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000018196.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000018196.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="trustedadmin_meta_policy_rule11" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">dcmo_enforcement_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~15104
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000018432.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000018432.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<po poid="application_meta_policy" rcaid="rpor">|18711<ta><acs><ac><am mid="seid"> <av dt= "str">add</av> <aa aid="urn:oasis:names:tc:xacml:1.0:action:action-id" dt="str"/> </am></ac><ac><am mid="seid"> <av dt= "str">remove</av> <aa aid="urn:oasis:names:tc:xacml:1.0:action:action-id" dt="str"/> </am></ac><ac><am mid="seid"> <av dt= "str">replace</av> <aa aid="urn:oasis:names:tc:xacml:1.0:action:action-id" dt="str"/> </am></ac></acs></ta>|18964</po>~13057
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000018711.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000018711.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<desc>Application Meta Policy. This metapolicy is used for giving policy modifing right for applications.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies/0000018964.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies/0000018964.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="application_meta_policy_rule1" ef="pe"><ta><sus><su><sm mid="seid"> <av dt= "str">SECUREID[10207836]</av> <sa aid="urn:oasis:names:tc:xacml:1.0:subject:subject-id" dt="str"/> </sm></su></sus><res><re><rm mid="seid"> <av dt= "str">device_lock_passcode_visibility_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~18432
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000000257.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000000257.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ps psid="root_element" pcid="pdor">|535|768|1281|9729|13569</ps>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000000535.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000000535.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<desc>Root element of policy system.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000000768.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000000768.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<po poid="cert_mapping_policy" rcaid="rpor">|1047</po>~257
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000001047.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000001047.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<desc>Certificate mapping policy. Policy contains certificate mappings.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000001281.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000001281.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ps psid="action_policy_set" pcid="ppor">|1559|1793|8960</ps>~257
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000001559.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000001559.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<desc>Action policy set policies.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000001793.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000001793.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ps psid="settings_policy_set" pcid="ppor">|2071|2304|3072|3840|4608|5376|6144|6912|7936</ps>~1281
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000002071.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000002071.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<desc>Settings policy set policies.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000002304.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000002304.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<po poid="email_enforcement_policy" rcaid="rpor">|2583<ta><res><re><rm mid="seid"> <av dt= "str">EMailEnforcement</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|2836</po>~1793
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000002583.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000002583.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<desc>Email enforcement policy. This policy is used for enforcing email settings.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000002836.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000002836.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="email_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~2304
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000003072.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000003072.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<po poid="syncml_enforcement_policy" rcaid="rpor">|3351<ta><res><re><rm mid="seid"> <av dt= "str">SyncMLEnforcement</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|3604</po>~1793
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000003351.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000003351.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<desc>Email enforcement policy. This policy is used for enforcing SyncML settings.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000003604.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000003604.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="syncml_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~3072
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000003840.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000003840.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<po poid="datasync_enforcement_policy" rcaid="rpor">|4119<ta><res><re><rm mid="seid"> <av dt= "str">DataSyncEnforcement</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|4372</po>~1793
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000004119.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000004119.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<desc>Email enforcement policy. This policy is used for enforcing DataSync settings.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000004372.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000004372.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="datasync_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~3840
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000004608.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000004608.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<po poid="ap_enforcement_policy" rcaid="rpor">|4887<ta><res><re><rm mid="seid"> <av dt= "str">AccessPointEnforcement</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|5140</po>~1793
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000004887.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000004887.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<desc>Access point enforcement policy. This policy is used for enforcing access point settings.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000005140.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000005140.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="ap_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~4608
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000005376.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000005376.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<po poid="wlan_enforcement_policy" rcaid="rpor">|5655<ta><res><re><rm mid="seid"> <av dt= "str">WLANEnforcement</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|5908</po>~1793
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000005655.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000005655.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<desc>WLAN enforcement policy. This policy is used for enforcing WLAN settings.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000005908.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000005908.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="wlan_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~5376
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000006144.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000006144.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<po poid="im_enforcement_policy" rcaid="rpor">|6423<ta><res><re><rm mid="seid"> <av dt= "str">InstantMessagingEnforcemnt</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|6676</po>~1793
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000006423.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000006423.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<desc>Instant messaging policy. This policy is used for instant messaging settings.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000006676.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000006676.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="im_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~6144
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000006912.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000006912.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<po poid="application_management_enforcement_policy" rcaid="rpor">|7191<ta><res><re><rm mid="seid"> <av dt= "str">ApplicationManagement</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|7444|7700</po>~1793
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000007191.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000007191.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<desc>Application Management enforcement policy. This policy is used for enforcing Application Management.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000007444.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000007444.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="application_management_enforcement_policy_rule1" ef="pe"><ta /></ru>~6912
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000007700.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000007700.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="application_management_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~6912
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000007936.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000007936.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<po poid="customization_management_enforcement_policy" rcaid="rpor">|8215<ta><res><re><rm mid="seid"> <av dt= "str">CustomizationManagement</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|8468|8724</po>~1793
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000008215.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000008215.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<desc>Customization Management enforcement policy. This policy is used for enforcing Customization Management.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000008468.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000008468.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="customization_management_enforcement_policy_rule1" ef="pe"><ta /></ru>~7936
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000008724.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000008724.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="customization_management_enforcement_policy_permanent" ef="de"><ta /></ru>~7936
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000008960.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000008960.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<po poid="terminal_security_management_enforcement_policy" rcaid="rpor">|9239<ta><res><re><rm mid="seid"> <av dt= "str">TerminalSecurityManagement</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|9492</po>~1281
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000009239.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000009239.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<desc>Terminal control enforcement policy. This policy is used for enforcing Terminal Control.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000009492.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000009492.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="terminal_security_management_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~8960
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000009729.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000009729.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ps psid="terminal_security_policy_set" pcid="ppor">|9984|10496</ps>~257
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000009984.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000009984.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<po poid="device_lock_passcode_visibility_policy" rcaid="rdor"><ta><res><re><rm mid="seid"> <av dt= "str">DeviceLockPasscodeVisibility</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|10260</po>~9729
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000010260.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000010260.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="device_lock_passcode_visibility_policy_rule1" ef="pe"><ta /></ru>~9984
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000010496.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000010496.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<po poid="thirdparty_secure_ids_policy" rcaid="rpor"><ta><res><re><rm mid="seid"> <av dt= "str">ThirdPartySecureIds</av> <ra aid="urn:oasis:names:tc:xacml:1.0:resource:resource-id" dt="str"/> </rm></re></res></ta>|10772|11028|11284|11540|11796|12052|12308|12564|12820|13076|13332</po>~9729
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000010772.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000010772.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="thirdparty_secure_ids_policy_permanent_rule1" ef="de"><ta /></ru>~10496
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000011028.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000011028.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="thirdparty_secure_ids_policy_permanent_rule2" ef="pe"><ta><sus><su><sm mid="seid"> <av dt= "str">SECUREID[10206970]</av> <sa aid="urn:oasis:names:tc:xacml:1.0:subject:subject-id" dt="str"/> </sm></su></sus></ta></ru>~10496
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000011284.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000011284.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="thirdparty_secure_ids_policy_permanent_rule3" ef="pe"><ta><sus><su><sm mid="seid"> <av dt= "str">SECUREID[1027370C]</av> <sa aid="urn:oasis:names:tc:xacml:1.0:subject:subject-id" dt="str"/> </sm></su></sus></ta></ru>~10496
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000011540.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000011540.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="thirdparty_secure_ids_policy_permanent_rule4" ef="pe"><ta><sus><su><sm mid="seid"> <av dt= "str">SECUREID[10206802]</av> <sa aid="urn:oasis:names:tc:xacml:1.0:subject:subject-id" dt="str"/> </sm></su></sus></ta></ru>~10496
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000011796.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000011796.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="thirdparty_secure_ids_policy_permanent_rule5" ef="pe"><ta><sus><su><sm mid="seid"> <av dt= "str">SECUREID[10206970]</av> <sa aid="urn:oasis:names:tc:xacml:1.0:subject:subject-id" dt="str"/> </sm></su></sus></ta></ru>~10496
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000012052.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000012052.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="thirdparty_secure_ids_policy_permanent_rule6" ef="pe"><ta><sus><su><sm mid="seid"> <av dt= "str">SECUREID[20002CF9]</av> <sa aid="urn:oasis:names:tc:xacml:1.0:subject:subject-id" dt="str"/> </sm></su></sus></ta></ru>~10496
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000012308.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000012308.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="thirdparty_secure_ids_policy_permanent_rule7" ef="pe"><ta><sus><su><sm mid="seid"> <av dt= "str">SECUREID[20002CFA]</av> <sa aid="urn:oasis:names:tc:xacml:1.0:subject:subject-id" dt="str"/> </sm></su></sus></ta></ru>~10496
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000012564.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000012564.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="thirdparty_secure_ids_policy_permanent_rule8" ef="pe"><ta><sus><su><sm mid="seid"> <av dt= "str">SECUREID[20002CFB]</av> <sa aid="urn:oasis:names:tc:xacml:1.0:subject:subject-id" dt="str"/> </sm></su></sus></ta></ru>~10496
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000012820.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000012820.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="thirdparty_secure_ids_policy_permanent_rule9" ef="pe"><ta><sus><su><sm mid="seid"> <av dt= "str">SECUREID[20002CFC]</av> <sa aid="urn:oasis:names:tc:xacml:1.0:subject:subject-id" dt="str"/> </sm></su></sus></ta></ru>~10496
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000013076.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000013076.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="thirdparty_secure_ids_policy_permanent_rule10" ef="pe"><ta><sus><su><sm mid="seid"> <av dt= "str">SECUREID[20002CFD]</av> <sa aid="urn:oasis:names:tc:xacml:1.0:subject:subject-id" dt="str"/> </sm></su></sus></ta></ru>~10496
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000013332.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000013332.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="thirdparty_secure_ids_policy_permanent_rule11" ef="pe"><ta><sus><su><sm mid="seid"> <av dt= "str">SECUREID[20001D6A]</av> <sa aid="urn:oasis:names:tc:xacml:1.0:subject:subject-id" dt="str"/> </sm></su></sus></ta></ru>~10496
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000013569.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000013569.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ps psid="meta_policy_set" pcid="ppor">|13847|14080|14849</ps>~257
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000013847.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000013847.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<desc>Meta policy set policies.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000014080.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000014080.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<po poid="certificate_mapping_rights_policy" rcaid="rpor">|14359|14612</po>~13569
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000014359.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000014359.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<desc>This policy defines who has rights to modify certificate mapping policies. Currentlyonly certificate owner can edit mapping rules!</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000014612.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000014612.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="certificate_mapping_rights_policy_rule1" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">cert_mapping_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta><con><app fid="seid"><sa aid="trusted_subject" dt="str"/><sa aid="target_trusted_subject" dt="str"/></app></con></ru>~14080
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000014849.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000014849.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ps psid="trustedadmin_meta_policy_set" pcid="ppor">|15127|15360|15872|16896|19968</ps>~13569
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000015127.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000015127.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<desc>Trustedadmin meta policy set policies.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000015360.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000015360.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<po poid="roles_mapping_policy" rcaid="rpor">|15639</po>~14849
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000015639.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000015639.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<desc>Roles policy. This metapolicy is used for controlling roles in policy system.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000015872.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000015872.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<po poid="initial_trustedadmin_policy" rcaid="rpor">|16151|16404|16660</po>~14849
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000016151.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000016151.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<desc>Initial trustedadmin Policy. This policy grants trustedadmin Policy Rights to trustedadmin. This is requested from user.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000016404.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000016404.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="initial_trustedadmin_policy_rule1" ef="pe"><ta><acs><ac><am mid="seid"> <av dt= "str">add</av> <aa aid="urn:oasis:names:tc:xacml:1.0:action:action-id" dt="str"/> </am></ac></acs><res><re><rm mid="seid"> <av dt= "str">roles_mapping_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta><con><app fid="andid"><app fid="uaicpid"><sa aid="target_trusted_subject" dt="str"/></app><app fid="csid"></app><app fid="rtsid"><av dt= "str">subject</av><av dt= "str">trusted_subject</av><av dt= "str">any</av><av dt= "str">subject</av><av dt= "str">urn:nokia:names:s60:corporate:1.0:subject:role_id</av><av dt= "str">trustedadmin</av></app></app></con></ru>~15872
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000016660.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000016660.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="initial_trustedadmin_policy_rule2" ef="pe"><ta><acs><ac><am mid="seid"> <av dt= "str">remove</av> <aa aid="urn:oasis:names:tc:xacml:1.0:action:action-id" dt="str"/> </am></ac></acs><res><re><rm mid="seid"> <av dt= "str">roles_mapping_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta><con><app fid="andid"><app fid="csid"></app><app fid="rtsid"><av dt= "str">subject</av><av dt= "str">trusted_subject</av><av dt= "str">any</av><av dt= "str">subject</av><av dt= "str">urn:nokia:names:s60:corporate:1.0:subject:role_id</av><av dt= "str">trustedadmin</av></app></app></con></ru>~15872
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000016896.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000016896.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<po poid="trustedadmin_meta_policy" rcaid="rpor">|17175<ta><sus><su><sm mid="trm"> <av dt= "str">trustedadmin</av> <sa aid="urn:nokia:names:s60:corporate:1.0:subject:role_id" dt="str"/> </sm></su></sus><acs><ac><am mid="seid"> <av dt= "str">add</av> <aa aid="urn:oasis:names:tc:xacml:1.0:action:action-id" dt="str"/> </am></ac><ac><am mid="seid"> <av dt= "str">remove</av> <aa aid="urn:oasis:names:tc:xacml:1.0:action:action-id" dt="str"/> </am></ac><ac><am mid="seid"> <av dt= "str">replace</av> <aa aid="urn:oasis:names:tc:xacml:1.0:action:action-id" dt="str"/> </am></ac></acs></ta>|17428|17684|17940|18196|18452|18708|18964|19220|19476|19732</po>~14849
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000017175.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000017175.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<desc>trustedadmin Meta Policy. This metapolicy is used for controlling enforcement policies in policy system.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000017428.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000017428.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="trustedadmin_meta_policy_rule1" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">wlan_enforcement_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~16896
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000017684.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000017684.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="trustedadmin_meta_policy_rule2" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">datasync_enforcement_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~16896
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000017940.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000017940.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="trustedadmin_meta_policy_rule3" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">syncml_enforcement_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~16896
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000018196.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000018196.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="trustedadmin_meta_policy_rule4" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">email_enforcement_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~16896
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000018452.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000018452.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="trustedadmin_meta_policy_rule5" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">im_enforcement_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~16896
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000018708.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000018708.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="trustedadmin_meta_policy_rule6" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">ap_enforcement_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~16896
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000018964.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000018964.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="trustedadmin_meta_policy_rule7" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">customization_management_enforcement_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~16896
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000019220.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000019220.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="trustedadmin_meta_policy_rule8" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">application_management_enforcement_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~16896
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000019476.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000019476.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="trustedadmin_meta_policy_rule9" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">terminal_security_management_enforcement_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~16896
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000019732.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000019732.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="trustedadmin_meta_policy_rule10" ef="pe"><ta><res><re><rm mid="seid"> <av dt= "str">thirdparty_secure_ids_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~16896
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000019968.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000019968.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<po poid="application_meta_policy" rcaid="rpor">|20247<ta><acs><ac><am mid="seid"> <av dt= "str">add</av> <aa aid="urn:oasis:names:tc:xacml:1.0:action:action-id" dt="str"/> </am></ac><ac><am mid="seid"> <av dt= "str">remove</av> <aa aid="urn:oasis:names:tc:xacml:1.0:action:action-id" dt="str"/> </am></ac><ac><am mid="seid"> <av dt= "str">replace</av> <aa aid="urn:oasis:names:tc:xacml:1.0:action:action-id" dt="str"/> </am></ac></acs></ta>|20500</po>~14849
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000020247.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000020247.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<desc>Application Meta Policy. This metapolicy is used for giving policy modifing right for applications.</desc>
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000020500.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/policies_apollo30/0000020500.txt	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,1 @@
+<ru ruid="application_meta_policy_rule1" ef="pe"><ta><sus><su><sm mid="seid"> <av dt= "str">SECUREID[10207836]</av> <sa aid="urn:oasis:names:tc:xacml:1.0:subject:subject-id" dt="str"/> </sm></su></sus><res><re><rm mid="seid"> <av dt= "str">device_lock_passcode_visibility_policy</av> <ra aid="policy_target" dt="str"/> </rm></re></res></ta></ru>~19968
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/group/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/group/bld.inf	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,261 @@
+/*
+* Copyright (c) 2005 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: Implementation of policymanagement components
+*
+*/
+
+
+
+#include <platform_paths.hrh>
+
+PRJ_EXPORTS
+
+../rom/10207815.txt /epoc32/data/z/private/10202be9/10207815.txt
+../rom/10207816.txt /epoc32/data/z/private/10202be9/10207816.txt
+../rom/10207815.txt /epoc32/release/winscw/udeb/z/private/10202be9/10207815.txt
+../rom/10207816.txt /epoc32/release/winscw/udeb/z/private/10202be9/10207816.txt
+../rom/10207815.txt /epoc32/release/winscw/urel/z/private/10202be9/10207815.txt
+../rom/10207816.txt /epoc32/release/winscw/urel/z/private/10202be9/10207816.txt
+
+../rom/pe_data.iby	CORE_MW_LAYER_IBY_EXPORT_PATH(pe_data_s60.iby)
+
+../data/policies/0000000257.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000000257.txt
+../data/policies/0000000535.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000000535.txt
+../data/policies/0000000768.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000000768.txt
+../data/policies/0000001047.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000001047.txt
+../data/policies/0000001281.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000001281.txt
+../data/policies/0000001559.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000001559.txt
+../data/policies/0000001793.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000001793.txt
+../data/policies/0000002071.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000002071.txt
+../data/policies/0000002304.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000002304.txt
+../data/policies/0000002583.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000002583.txt
+../data/policies/0000002836.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000002836.txt
+../data/policies/0000003072.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000003072.txt
+../data/policies/0000003351.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000003351.txt
+../data/policies/0000003604.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000003604.txt
+../data/policies/0000003840.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000003840.txt
+../data/policies/0000004119.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000004119.txt
+../data/policies/0000004372.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000004372.txt
+../data/policies/0000004608.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000004608.txt
+../data/policies/0000004887.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000004887.txt
+../data/policies/0000005140.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000005140.txt
+../data/policies/0000005376.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000005376.txt
+../data/policies/0000005655.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000005655.txt
+../data/policies/0000005908.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000005908.txt
+../data/policies/0000006144.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000006144.txt
+../data/policies/0000006423.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000006423.txt
+../data/policies/0000006676.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000006676.txt
+../data/policies/0000006912.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000006912.txt
+../data/policies/0000007191.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000007191.txt
+../data/policies/0000007444.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000007444.txt 
+../data/policies/0000007700.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000007700.txt
+../data/policies/0000007936.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000007936.txt
+../data/policies/0000008215.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000008215.txt
+../data/policies/0000008468.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000008468.txt
+../data/policies/0000008724.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000008724.txt
+../data/policies/0000008960.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000008960.txt
+../data/policies/0000009239.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000009239.txt
+../data/policies/0000009492.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000009492.txt
+../data/policies/0000009728.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000009728.txt
+../data/policies/0000010007.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000010007.txt
+../data/policies/0000010260.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000010260.txt
+../data/policies/0000010497.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000010497.txt
+../data/policies/0000010752.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000010752.txt
+../data/policies/0000011028.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000011028.txt
+../data/policies/0000011264.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000011264.txt
+../data/policies/0000011540.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000011540.txt
+../data/policies/0000011777.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000011777.txt
+../data/policies/0000012055.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000012055.txt
+../data/policies/0000012288.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000012288.txt
+../data/policies/0000012567.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000012567.txt
+../data/policies/0000012820.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000012820.txt
+../data/policies/0000013057.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000013057.txt
+../data/policies/0000013335.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000013335.txt
+../data/policies/0000013568.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000013568.txt
+../data/policies/0000013847.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000013847.txt
+../data/policies/0000014080.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000014080.txt
+../data/policies/0000014359.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000014359.txt
+../data/policies/0000014612.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000014612.txt
+../data/policies/0000014868.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000014868.txt
+../data/policies/0000015104.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000015104.txt
+../data/policies/0000015383.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000015383.txt
+../data/policies/0000015636.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000015636.txt
+../data/policies/0000015892.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000015892.txt
+../data/policies/0000016148.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000016148.txt
+../data/policies/0000016404.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000016404.txt
+../data/policies/0000016660.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000016660.txt
+../data/policies/0000016916.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000016916.txt
+../data/policies/0000017172.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000017172.txt
+../data/policies/0000017428.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000017428.txt
+../data/policies/0000017684.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000017684.txt
+../data/policies/0000017940.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000017940.txt
+../data/policies/0000018196.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000018196.txt
+../data/policies/0000018432.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000018432.txt
+../data/policies/0000018711.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000018711.txt
+../data/policies/0000018964.txt 	 /epoc32/RELEASE/winscw/UDEB/Z/private/10207815/0000018964.txt
+
+../data/policies/0000000257.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000000257.txt
+../data/policies/0000000535.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000000535.txt
+../data/policies/0000000768.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000000768.txt
+../data/policies/0000001047.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000001047.txt
+../data/policies/0000001281.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000001281.txt
+../data/policies/0000001559.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000001559.txt
+../data/policies/0000001793.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000001793.txt
+../data/policies/0000002071.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000002071.txt
+../data/policies/0000002304.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000002304.txt
+../data/policies/0000002583.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000002583.txt
+../data/policies/0000002836.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000002836.txt
+../data/policies/0000003072.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000003072.txt
+../data/policies/0000003351.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000003351.txt
+../data/policies/0000003604.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000003604.txt
+../data/policies/0000003840.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000003840.txt
+../data/policies/0000004119.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000004119.txt
+../data/policies/0000004372.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000004372.txt
+../data/policies/0000004608.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000004608.txt
+../data/policies/0000004887.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000004887.txt
+../data/policies/0000005140.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000005140.txt
+../data/policies/0000005376.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000005376.txt
+../data/policies/0000005655.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000005655.txt
+../data/policies/0000005908.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000005908.txt
+../data/policies/0000006144.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000006144.txt
+../data/policies/0000006423.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000006423.txt
+../data/policies/0000006676.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000006676.txt
+../data/policies/0000006912.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000006912.txt
+../data/policies/0000007191.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000007191.txt
+../data/policies/0000007444.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000007444.txt 
+../data/policies/0000007700.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000007700.txt
+../data/policies/0000007936.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000007936.txt
+../data/policies/0000008215.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000008215.txt
+../data/policies/0000008468.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000008468.txt
+../data/policies/0000008724.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000008724.txt
+../data/policies/0000008960.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000008960.txt
+../data/policies/0000009239.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000009239.txt
+../data/policies/0000009492.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000009492.txt
+../data/policies/0000009728.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000009728.txt
+../data/policies/0000010007.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000010007.txt
+../data/policies/0000010260.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000010260.txt
+../data/policies/0000010497.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000010497.txt
+../data/policies/0000010752.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000010752.txt
+../data/policies/0000011028.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000011028.txt
+../data/policies/0000011264.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000011264.txt
+../data/policies/0000011540.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000011540.txt
+../data/policies/0000011777.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000011777.txt
+../data/policies/0000012055.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000012055.txt
+../data/policies/0000012288.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000012288.txt
+../data/policies/0000012567.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000012567.txt
+../data/policies/0000012820.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000012820.txt
+../data/policies/0000013057.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000013057.txt
+../data/policies/0000013335.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000013335.txt
+../data/policies/0000013568.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000013568.txt
+../data/policies/0000013847.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000013847.txt
+../data/policies/0000014080.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000014080.txt
+../data/policies/0000014359.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000014359.txt
+../data/policies/0000014612.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000014612.txt
+../data/policies/0000014868.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000014868.txt
+../data/policies/0000015104.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000015104.txt
+../data/policies/0000015383.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000015383.txt
+../data/policies/0000015636.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000015636.txt
+../data/policies/0000015892.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000015892.txt
+../data/policies/0000016148.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000016148.txt
+../data/policies/0000016404.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000016404.txt
+../data/policies/0000016660.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000016660.txt
+../data/policies/0000016916.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000016916.txt
+../data/policies/0000017172.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000017172.txt
+../data/policies/0000017428.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000017428.txt
+../data/policies/0000017684.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000017684.txt
+../data/policies/0000017940.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000017940.txt
+../data/policies/0000018196.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000018196.txt
+../data/policies/0000018432.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000018432.txt
+../data/policies/0000018711.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000018711.txt
+../data/policies/0000018964.txt 	 /epoc32/RELEASE/winscw/UREL/Z/private/10207815/0000018964.txt
+
+../data/policies/0000000257.txt 	 /epoc32/data/Z/private/10207815/0000000257.txt
+../data/policies/0000000535.txt 	 /epoc32/data/Z/private/10207815/0000000535.txt
+../data/policies/0000000768.txt 	 /epoc32/data/Z/private/10207815/0000000768.txt
+../data/policies/0000001047.txt 	 /epoc32/data/Z/private/10207815/0000001047.txt
+../data/policies/0000001281.txt 	 /epoc32/data/Z/private/10207815/0000001281.txt
+../data/policies/0000001559.txt 	 /epoc32/data/Z/private/10207815/0000001559.txt
+../data/policies/0000001793.txt 	 /epoc32/data/Z/private/10207815/0000001793.txt
+../data/policies/0000002071.txt 	 /epoc32/data/Z/private/10207815/0000002071.txt
+../data/policies/0000002304.txt 	 /epoc32/data/Z/private/10207815/0000002304.txt
+../data/policies/0000002583.txt 	 /epoc32/data/Z/private/10207815/0000002583.txt
+../data/policies/0000002836.txt 	 /epoc32/data/Z/private/10207815/0000002836.txt
+../data/policies/0000003072.txt 	 /epoc32/data/Z/private/10207815/0000003072.txt
+../data/policies/0000003351.txt 	 /epoc32/data/Z/private/10207815/0000003351.txt
+../data/policies/0000003604.txt 	 /epoc32/data/Z/private/10207815/0000003604.txt
+../data/policies/0000003840.txt 	 /epoc32/data/Z/private/10207815/0000003840.txt
+../data/policies/0000004119.txt 	 /epoc32/data/Z/private/10207815/0000004119.txt
+../data/policies/0000004372.txt 	 /epoc32/data/Z/private/10207815/0000004372.txt
+../data/policies/0000004608.txt 	 /epoc32/data/Z/private/10207815/0000004608.txt
+../data/policies/0000004887.txt 	 /epoc32/data/Z/private/10207815/0000004887.txt
+../data/policies/0000005140.txt 	 /epoc32/data/Z/private/10207815/0000005140.txt
+../data/policies/0000005376.txt 	 /epoc32/data/Z/private/10207815/0000005376.txt
+../data/policies/0000005655.txt 	 /epoc32/data/Z/private/10207815/0000005655.txt
+../data/policies/0000005908.txt 	 /epoc32/data/Z/private/10207815/0000005908.txt
+../data/policies/0000006144.txt 	 /epoc32/data/Z/private/10207815/0000006144.txt
+../data/policies/0000006423.txt 	 /epoc32/data/Z/private/10207815/0000006423.txt
+../data/policies/0000006676.txt 	 /epoc32/data/Z/private/10207815/0000006676.txt
+../data/policies/0000006912.txt 	 /epoc32/data/Z/private/10207815/0000006912.txt
+../data/policies/0000007191.txt 	 /epoc32/data/Z/private/10207815/0000007191.txt
+../data/policies/0000007444.txt 	 /epoc32/data/Z/private/10207815/0000007444.txt 
+../data/policies/0000007700.txt 	 /epoc32/data/Z/private/10207815/0000007700.txt
+../data/policies/0000007936.txt 	 /epoc32/data/Z/private/10207815/0000007936.txt
+../data/policies/0000008215.txt 	 /epoc32/data/Z/private/10207815/0000008215.txt
+../data/policies/0000008468.txt 	 /epoc32/data/Z/private/10207815/0000008468.txt
+../data/policies/0000008724.txt 	 /epoc32/data/Z/private/10207815/0000008724.txt
+../data/policies/0000008960.txt 	 /epoc32/data/Z/private/10207815/0000008960.txt
+../data/policies/0000009239.txt 	 /epoc32/data/Z/private/10207815/0000009239.txt
+../data/policies/0000009492.txt 	 /epoc32/data/Z/private/10207815/0000009492.txt
+../data/policies/0000009728.txt 	 /epoc32/data/Z/private/10207815/0000009728.txt
+../data/policies/0000010007.txt 	 /epoc32/data/Z/private/10207815/0000010007.txt
+../data/policies/0000010260.txt 	 /epoc32/data/Z/private/10207815/0000010260.txt
+../data/policies/0000010497.txt 	 /epoc32/data/Z/private/10207815/0000010497.txt
+../data/policies/0000010752.txt 	 /epoc32/data/Z/private/10207815/0000010752.txt
+../data/policies/0000011028.txt 	 /epoc32/data/Z/private/10207815/0000011028.txt
+../data/policies/0000011264.txt 	 /epoc32/data/Z/private/10207815/0000011264.txt
+../data/policies/0000011540.txt 	 /epoc32/data/Z/private/10207815/0000011540.txt
+../data/policies/0000011777.txt 	 /epoc32/data/Z/private/10207815/0000011777.txt
+../data/policies/0000012055.txt 	 /epoc32/data/Z/private/10207815/0000012055.txt
+../data/policies/0000012288.txt 	 /epoc32/data/Z/private/10207815/0000012288.txt
+../data/policies/0000012567.txt 	 /epoc32/data/Z/private/10207815/0000012567.txt
+../data/policies/0000012820.txt 	 /epoc32/data/Z/private/10207815/0000012820.txt
+../data/policies/0000013057.txt 	 /epoc32/data/Z/private/10207815/0000013057.txt
+../data/policies/0000013335.txt 	 /epoc32/data/Z/private/10207815/0000013335.txt
+../data/policies/0000013568.txt 	 /epoc32/data/Z/private/10207815/0000013568.txt
+../data/policies/0000013847.txt 	 /epoc32/data/Z/private/10207815/0000013847.txt
+../data/policies/0000014080.txt 	 /epoc32/data/Z/private/10207815/0000014080.txt
+../data/policies/0000014359.txt 	 /epoc32/data/Z/private/10207815/0000014359.txt
+../data/policies/0000014612.txt 	 /epoc32/data/Z/private/10207815/0000014612.txt
+../data/policies/0000014868.txt 	 /epoc32/data/Z/private/10207815/0000014868.txt
+../data/policies/0000015104.txt 	 /epoc32/data/Z/private/10207815/0000015104.txt
+../data/policies/0000015383.txt 	 /epoc32/data/Z/private/10207815/0000015383.txt
+../data/policies/0000015636.txt 	 /epoc32/data/Z/private/10207815/0000015636.txt
+../data/policies/0000015892.txt 	 /epoc32/data/Z/private/10207815/0000015892.txt
+../data/policies/0000016148.txt 	 /epoc32/data/Z/private/10207815/0000016148.txt
+../data/policies/0000016404.txt 	 /epoc32/data/Z/private/10207815/0000016404.txt
+../data/policies/0000016660.txt 	 /epoc32/data/Z/private/10207815/0000016660.txt
+../data/policies/0000016916.txt 	 /epoc32/data/Z/private/10207815/0000016916.txt
+../data/policies/0000017172.txt 	 /epoc32/data/Z/private/10207815/0000017172.txt
+../data/policies/0000017428.txt 	 /epoc32/data/Z/private/10207815/0000017428.txt
+../data/policies/0000017684.txt 	 /epoc32/data/Z/private/10207815/0000017684.txt
+../data/policies/0000017940.txt 	 /epoc32/data/Z/private/10207815/0000017940.txt
+../data/policies/0000018196.txt 	 /epoc32/data/Z/private/10207815/0000018196.txt
+../data/policies/0000018432.txt 	 /epoc32/data/Z/private/10207815/0000018432.txt
+../data/policies/0000018711.txt 	 /epoc32/data/Z/private/10207815/0000018711.txt
+../data/policies/0000018964.txt 	 /epoc32/data/Z/private/10207815/0000018964.txt
+
+
+//PRJ_MMPFILES
+
+//PRJ_TESTMMPFILES
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/rom/10207815.txt
Binary file policymanagement/policyengine/policyenginepolicies/rom/10207815.txt has changed
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/rom/10207816.txt
Binary file policymanagement/policyengine/policyenginepolicies/rom/10207816.txt has changed
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/policyenginepolicies/rom/pe_data.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/rom/pe_data.iby	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,99 @@
+/*
+* 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 the License "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: Implementation of policymanagement components
+*
+*/
+#ifndef __POLICY_ENGINE_DATA_IBY__
+#define __POLICY_ENGINE_DATA_IBY__
+
+//Policy engine data files 
+
+data=ZPRIVATE\10207815\0000000535.txt 	 private\10207815\0000000535.txt
+data=ZPRIVATE\10207815\0000001047.txt 	 private\10207815\0000001047.txt
+data=ZPRIVATE\10207815\0000000768.txt 	 private\10207815\0000000768.txt
+data=ZPRIVATE\10207815\0000001559.txt 	 private\10207815\0000001559.txt
+data=ZPRIVATE\10207815\0000002071.txt 	 private\10207815\0000002071.txt
+data=ZPRIVATE\10207815\0000002583.txt 	 private\10207815\0000002583.txt
+data=ZPRIVATE\10207815\0000002836.txt 	 private\10207815\0000002836.txt
+data=ZPRIVATE\10207815\0000002304.txt 	 private\10207815\0000002304.txt
+data=ZPRIVATE\10207815\0000003351.txt 	 private\10207815\0000003351.txt
+data=ZPRIVATE\10207815\0000003604.txt 	 private\10207815\0000003604.txt
+data=ZPRIVATE\10207815\0000003072.txt 	 private\10207815\0000003072.txt
+data=ZPRIVATE\10207815\0000004119.txt 	 private\10207815\0000004119.txt
+data=ZPRIVATE\10207815\0000004372.txt 	 private\10207815\0000004372.txt
+data=ZPRIVATE\10207815\0000003840.txt 	 private\10207815\0000003840.txt
+data=ZPRIVATE\10207815\0000004887.txt 	 private\10207815\0000004887.txt
+data=ZPRIVATE\10207815\0000005140.txt 	 private\10207815\0000005140.txt
+data=ZPRIVATE\10207815\0000004608.txt 	 private\10207815\0000004608.txt
+data=ZPRIVATE\10207815\0000005655.txt 	 private\10207815\0000005655.txt
+data=ZPRIVATE\10207815\0000005908.txt 	 private\10207815\0000005908.txt
+data=ZPRIVATE\10207815\0000005376.txt 	 private\10207815\0000005376.txt
+data=ZPRIVATE\10207815\0000006423.txt 	 private\10207815\0000006423.txt
+data=ZPRIVATE\10207815\0000006676.txt 	 private\10207815\0000006676.txt
+data=ZPRIVATE\10207815\0000006144.txt 	 private\10207815\0000006144.txt
+data=ZPRIVATE\10207815\0000007191.txt 	 private\10207815\0000007191.txt
+data=ZPRIVATE\10207815\0000007444.txt 	 private\10207815\0000007444.txt
+data=ZPRIVATE\10207815\0000007700.txt 	 private\10207815\0000007700.txt
+data=ZPRIVATE\10207815\0000006912.txt 	 private\10207815\0000006912.txt
+data=ZPRIVATE\10207815\0000008215.txt 	 private\10207815\0000008215.txt
+data=ZPRIVATE\10207815\0000008468.txt 	 private\10207815\0000008468.txt
+data=ZPRIVATE\10207815\0000008724.txt 	 private\10207815\0000008724.txt
+data=ZPRIVATE\10207815\0000007936.txt 	 private\10207815\0000007936.txt
+data=ZPRIVATE\10207815\0000009239.txt 	 private\10207815\0000009239.txt
+data=ZPRIVATE\10207815\0000009492.txt 	 private\10207815\0000009492.txt
+data=ZPRIVATE\10207815\0000008960.txt 	 private\10207815\0000008960.txt
+data=ZPRIVATE\10207815\0000001793.txt 	 private\10207815\0000001793.txt
+data=ZPRIVATE\10207815\0000010007.txt 	 private\10207815\0000010007.txt
+data=ZPRIVATE\10207815\0000010260.txt 	 private\10207815\0000010260.txt
+data=ZPRIVATE\10207815\0000009728.txt 	 private\10207815\0000009728.txt
+data=ZPRIVATE\10207815\0000001281.txt 	 private\10207815\0000001281.txt
+data=ZPRIVATE\10207815\0000011028.txt 	 private\10207815\0000011028.txt
+data=ZPRIVATE\10207815\0000010752.txt 	 private\10207815\0000010752.txt
+data=ZPRIVATE\10207815\0000011540.txt 	 private\10207815\0000011540.txt
+data=ZPRIVATE\10207815\0000011264.txt 	 private\10207815\0000011264.txt
+data=ZPRIVATE\10207815\0000010497.txt 	 private\10207815\0000010497.txt
+data=ZPRIVATE\10207815\0000012055.txt 	 private\10207815\0000012055.txt
+data=ZPRIVATE\10207815\0000012567.txt 	 private\10207815\0000012567.txt
+data=ZPRIVATE\10207815\0000012820.txt 	 private\10207815\0000012820.txt
+data=ZPRIVATE\10207815\0000012288.txt 	 private\10207815\0000012288.txt
+data=ZPRIVATE\10207815\0000013335.txt 	 private\10207815\0000013335.txt
+data=ZPRIVATE\10207815\0000013847.txt 	 private\10207815\0000013847.txt
+data=ZPRIVATE\10207815\0000013568.txt 	 private\10207815\0000013568.txt
+data=ZPRIVATE\10207815\0000014359.txt 	 private\10207815\0000014359.txt
+data=ZPRIVATE\10207815\0000014612.txt 	 private\10207815\0000014612.txt
+data=ZPRIVATE\10207815\0000014868.txt 	 private\10207815\0000014868.txt
+data=ZPRIVATE\10207815\0000014080.txt 	 private\10207815\0000014080.txt
+data=ZPRIVATE\10207815\0000015383.txt 	 private\10207815\0000015383.txt
+data=ZPRIVATE\10207815\0000015636.txt 	 private\10207815\0000015636.txt
+data=ZPRIVATE\10207815\0000015892.txt 	 private\10207815\0000015892.txt
+data=ZPRIVATE\10207815\0000016148.txt 	 private\10207815\0000016148.txt
+data=ZPRIVATE\10207815\0000016404.txt 	 private\10207815\0000016404.txt
+data=ZPRIVATE\10207815\0000016660.txt 	 private\10207815\0000016660.txt
+data=ZPRIVATE\10207815\0000016916.txt 	 private\10207815\0000016916.txt
+data=ZPRIVATE\10207815\0000017172.txt 	 private\10207815\0000017172.txt
+data=ZPRIVATE\10207815\0000017428.txt 	 private\10207815\0000017428.txt
+data=ZPRIVATE\10207815\0000017684.txt 	 private\10207815\0000017684.txt
+data=ZPRIVATE\10207815\0000017940.txt 	 private\10207815\0000017940.txt
+data=ZPRIVATE\10207815\0000018196.txt 	 private\10207815\0000018196.txt
+data=ZPRIVATE\10207815\0000015104.txt 	 private\10207815\0000015104.txt
+data=ZPRIVATE\10207815\0000018711.txt 	 private\10207815\0000018711.txt
+data=ZPRIVATE\10207815\0000018964.txt 	 private\10207815\0000018964.txt
+data=ZPRIVATE\10207815\0000018432.txt 	 private\10207815\0000018432.txt
+data=ZPRIVATE\10207815\0000013057.txt 	 private\10207815\0000013057.txt
+data=ZPRIVATE\10207815\0000011777.txt 	 private\10207815\0000011777.txt
+data=ZPRIVATE\10207815\0000000257.txt 	 private\10207815\0000000257.txt
+
+
+#endif
+                
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/rom/10207815.txt
Binary file policymanagement/policyengine/rom/10207815.txt has changed
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/rom/10207816.txt
Binary file policymanagement/policyengine/rom/10207816.txt has changed
diff -r 3d85de3d90be -r 1b024573da70 policymanagement/policyengine/rom/pe_data.iby
--- a/policymanagement/policyengine/rom/pe_data.iby	Mon Mar 08 21:44:11 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +0,0 @@
-/*
-* 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: Implementation of policymanagement components
-*
-*/
-#ifndef __POLICY_ENGINE_DATA_IBY__
-#define __POLICY_ENGINE_DATA_IBY__
-
-//Policy engine data files 
-
-data=ZPRIVATE\10207815\0000000535.txt 	 private\10207815\0000000535.txt
-data=ZPRIVATE\10207815\0000001047.txt 	 private\10207815\0000001047.txt
-data=ZPRIVATE\10207815\0000000768.txt 	 private\10207815\0000000768.txt
-data=ZPRIVATE\10207815\0000001559.txt 	 private\10207815\0000001559.txt
-data=ZPRIVATE\10207815\0000002071.txt 	 private\10207815\0000002071.txt
-data=ZPRIVATE\10207815\0000002583.txt 	 private\10207815\0000002583.txt
-data=ZPRIVATE\10207815\0000002836.txt 	 private\10207815\0000002836.txt
-data=ZPRIVATE\10207815\0000002304.txt 	 private\10207815\0000002304.txt
-data=ZPRIVATE\10207815\0000003351.txt 	 private\10207815\0000003351.txt
-data=ZPRIVATE\10207815\0000003604.txt 	 private\10207815\0000003604.txt
-data=ZPRIVATE\10207815\0000003072.txt 	 private\10207815\0000003072.txt
-data=ZPRIVATE\10207815\0000004119.txt 	 private\10207815\0000004119.txt
-data=ZPRIVATE\10207815\0000004372.txt 	 private\10207815\0000004372.txt
-data=ZPRIVATE\10207815\0000003840.txt 	 private\10207815\0000003840.txt
-data=ZPRIVATE\10207815\0000004887.txt 	 private\10207815\0000004887.txt
-data=ZPRIVATE\10207815\0000005140.txt 	 private\10207815\0000005140.txt
-data=ZPRIVATE\10207815\0000004608.txt 	 private\10207815\0000004608.txt
-data=ZPRIVATE\10207815\0000005655.txt 	 private\10207815\0000005655.txt
-data=ZPRIVATE\10207815\0000005908.txt 	 private\10207815\0000005908.txt
-data=ZPRIVATE\10207815\0000005376.txt 	 private\10207815\0000005376.txt
-data=ZPRIVATE\10207815\0000006423.txt 	 private\10207815\0000006423.txt
-data=ZPRIVATE\10207815\0000006676.txt 	 private\10207815\0000006676.txt
-data=ZPRIVATE\10207815\0000006144.txt 	 private\10207815\0000006144.txt
-data=ZPRIVATE\10207815\0000007191.txt 	 private\10207815\0000007191.txt
-data=ZPRIVATE\10207815\0000007444.txt 	 private\10207815\0000007444.txt
-data=ZPRIVATE\10207815\0000007700.txt 	 private\10207815\0000007700.txt
-data=ZPRIVATE\10207815\0000006912.txt 	 private\10207815\0000006912.txt
-data=ZPRIVATE\10207815\0000008215.txt 	 private\10207815\0000008215.txt
-data=ZPRIVATE\10207815\0000008468.txt 	 private\10207815\0000008468.txt
-data=ZPRIVATE\10207815\0000008724.txt 	 private\10207815\0000008724.txt
-data=ZPRIVATE\10207815\0000007936.txt 	 private\10207815\0000007936.txt
-data=ZPRIVATE\10207815\0000009239.txt 	 private\10207815\0000009239.txt
-data=ZPRIVATE\10207815\0000009492.txt 	 private\10207815\0000009492.txt
-data=ZPRIVATE\10207815\0000008960.txt 	 private\10207815\0000008960.txt
-data=ZPRIVATE\10207815\0000001793.txt 	 private\10207815\0000001793.txt
-data=ZPRIVATE\10207815\0000010007.txt 	 private\10207815\0000010007.txt
-data=ZPRIVATE\10207815\0000010260.txt 	 private\10207815\0000010260.txt
-data=ZPRIVATE\10207815\0000009728.txt 	 private\10207815\0000009728.txt
-data=ZPRIVATE\10207815\0000001281.txt 	 private\10207815\0000001281.txt
-data=ZPRIVATE\10207815\0000011028.txt 	 private\10207815\0000011028.txt
-data=ZPRIVATE\10207815\0000010752.txt 	 private\10207815\0000010752.txt
-data=ZPRIVATE\10207815\0000011540.txt 	 private\10207815\0000011540.txt
-data=ZPRIVATE\10207815\0000011264.txt 	 private\10207815\0000011264.txt
-data=ZPRIVATE\10207815\0000010497.txt 	 private\10207815\0000010497.txt
-data=ZPRIVATE\10207815\0000012055.txt 	 private\10207815\0000012055.txt
-data=ZPRIVATE\10207815\0000012567.txt 	 private\10207815\0000012567.txt
-data=ZPRIVATE\10207815\0000012820.txt 	 private\10207815\0000012820.txt
-data=ZPRIVATE\10207815\0000012288.txt 	 private\10207815\0000012288.txt
-data=ZPRIVATE\10207815\0000013335.txt 	 private\10207815\0000013335.txt
-data=ZPRIVATE\10207815\0000013847.txt 	 private\10207815\0000013847.txt
-data=ZPRIVATE\10207815\0000013568.txt 	 private\10207815\0000013568.txt
-data=ZPRIVATE\10207815\0000014359.txt 	 private\10207815\0000014359.txt
-data=ZPRIVATE\10207815\0000014612.txt 	 private\10207815\0000014612.txt
-data=ZPRIVATE\10207815\0000014868.txt 	 private\10207815\0000014868.txt
-data=ZPRIVATE\10207815\0000014080.txt 	 private\10207815\0000014080.txt
-data=ZPRIVATE\10207815\0000015383.txt 	 private\10207815\0000015383.txt
-data=ZPRIVATE\10207815\0000015636.txt 	 private\10207815\0000015636.txt
-data=ZPRIVATE\10207815\0000015892.txt 	 private\10207815\0000015892.txt
-data=ZPRIVATE\10207815\0000016148.txt 	 private\10207815\0000016148.txt
-data=ZPRIVATE\10207815\0000016404.txt 	 private\10207815\0000016404.txt
-data=ZPRIVATE\10207815\0000016660.txt 	 private\10207815\0000016660.txt
-data=ZPRIVATE\10207815\0000016916.txt 	 private\10207815\0000016916.txt
-data=ZPRIVATE\10207815\0000017172.txt 	 private\10207815\0000017172.txt
-data=ZPRIVATE\10207815\0000017428.txt 	 private\10207815\0000017428.txt
-data=ZPRIVATE\10207815\0000017684.txt 	 private\10207815\0000017684.txt
-data=ZPRIVATE\10207815\0000017940.txt 	 private\10207815\0000017940.txt
-data=ZPRIVATE\10207815\0000018196.txt 	 private\10207815\0000018196.txt
-data=ZPRIVATE\10207815\0000015104.txt 	 private\10207815\0000015104.txt
-data=ZPRIVATE\10207815\0000018711.txt 	 private\10207815\0000018711.txt
-data=ZPRIVATE\10207815\0000018964.txt 	 private\10207815\0000018964.txt
-data=ZPRIVATE\10207815\0000018432.txt 	 private\10207815\0000018432.txt
-data=ZPRIVATE\10207815\0000013057.txt 	 private\10207815\0000013057.txt
-data=ZPRIVATE\10207815\0000011777.txt 	 private\10207815\0000011777.txt
-data=ZPRIVATE\10207815\0000000257.txt 	 private\10207815\0000000257.txt
-
-
-#endif
-                
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 remotemgmt_plat/common_agent_util_and_definitions_api/inc/nsmlconstants.h
--- a/remotemgmt_plat/common_agent_util_and_definitions_api/inc/nsmlconstants.h	Mon Mar 08 21:44:11 2010 +0000
+++ b/remotemgmt_plat/common_agent_util_and_definitions_api/inc/nsmlconstants.h	Sun Mar 14 13:12:06 2010 +0000
@@ -21,7 +21,7 @@
 
 #include <e32base.h>
 #include <e32cmn.h> 
-#include "NSmlConstantDefs.h"
+#include "nsmlconstantdefs.h"
 
 
 const TUid KNSmlSOSServerPolicyUID = { 0x101F99FB };
diff -r 3d85de3d90be -r 1b024573da70 remotemgmt_plat/device_management_parameter_api/inc/DevManInternalCRKeys.h
--- a/remotemgmt_plat/device_management_parameter_api/inc/DevManInternalCRKeys.h	Mon Mar 08 21:44:11 2010 +0000
+++ b/remotemgmt_plat/device_management_parameter_api/inc/DevManInternalCRKeys.h	Sun Mar 14 13:12:06 2010 +0000
@@ -149,5 +149,17 @@
 */
 const TUint32 KDevManMemCardCtrl = 0x00000010; 
 
+/*
+* This key is used to indicate whether the privacy policy disclaimer has been accepted
+* Default value : 0 
+* Allowed values.
+* 0,1 or 2 
+* If value is 0 when disclaimer not accepted
+* If value is 1 when disclaimer has been accepted
+* If value is 2 if the dialog has been displayed but not accepted yet
+* 
+*/
+const TUint32 KDMDisclaimerAccepted = 0x00000011;
+
 #endif // SYNCML_DEVMAN_INTERNAL_CR_KEYS_H
 
diff -r 3d85de3d90be -r 1b024573da70 remotemgmt_plat/dm_constant_definitions_api/inc/nsmldmconst.h
--- a/remotemgmt_plat/dm_constant_definitions_api/inc/nsmldmconst.h	Mon Mar 08 21:44:11 2010 +0000
+++ b/remotemgmt_plat/dm_constant_definitions_api/inc/nsmldmconst.h	Sun Mar 14 13:12:06 2010 +0000
@@ -29,6 +29,17 @@
 // FOTA
 const TInt KNSmlDMResetGenAlerts = -2;
 const TInt KNSmlMaxInt32Length = 10;
+// UID of the Sosserver
+const TUid KPSUidNSmlSOSServerKey = {0x101F99FB};
+
+// PubSub key used to share information about the ongoing Device Management Job
+const TUint32 KNSmlDMSilentJob = 0x0000002;
+
+enum TDmSessionType
+{
+ESilent = 1,
+ENonSilent
+};
 // FOTA end
 
 #endif //__NSMLDMCONST_H__
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 remotemgmt_plat/dm_constant_definitions_api/inc/nsmldmconstants.h
--- a/remotemgmt_plat/dm_constant_definitions_api/inc/nsmldmconstants.h	Mon Mar 08 21:44:11 2010 +0000
+++ b/remotemgmt_plat/dm_constant_definitions_api/inc/nsmldmconstants.h	Sun Mar 14 13:12:06 2010 +0000
@@ -24,7 +24,6 @@
 #define KNSmlDmServerIdMaxLength 150
 #define KNSmlDmSharedSecretMaxLength 50 
 
-
 #endif //__NSMLDMCONSTANTS_H__
 
 //  End of File
diff -r 3d85de3d90be -r 1b024573da70 remotemgmt_plat/dm_native_notifier_api/group/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/remotemgmt_plat/dm_native_notifier_api/group/bld.inf	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,28 @@
+/*
+* Copyright (c) 2006 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:  Interface file for DM Native Notifier.
+*
+*/
+
+
+#include <platform_paths.hrh>
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_EXPORTS
+
+../inc/DMNativeNotifier.h       		MW_LAYER_PLATFORM_EXPORT_PATH(DMNativeNotifier.h)
+../inc/DMNativeNotifier.inl     		MW_LAYER_PLATFORM_EXPORT_PATH(DMNativeNotifier.inl)
+../inc/DMNativeNotifierInterface.h       	MW_LAYER_PLATFORM_EXPORT_PATH(DMNativeNotifierInterface.h)
\ No newline at end of file
diff -r 3d85de3d90be -r 1b024573da70 remotemgmt_plat/dm_native_notifier_api/inc/DMNativeNotifier.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/remotemgmt_plat/dm_native_notifier_api/inc/DMNativeNotifier.h	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,58 @@
+/*
+* 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 the License "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: Defines the class which will load the DMNotifier plugin and would service the caller.
+*     
+*/
+
+#ifndef DMNATIVENOTIFIER_H
+#define DMNATIVENOTIFIER_H
+
+
+#include <DMNativeNotifierInterface.h>
+
+enum{
+    EDMDialogNotAccepted = 0,
+    EDMDialogAccepted = 1,
+    EDMDialogActive = 2
+};
+class CDMNativeNotifier : public CBase, public MDMNativeNotifierInterface
+{
+ public:
+    
+    /**
+    * Two-phased constructor.
+    */
+    static CDMNativeNotifier* NewL(TUid aOperationId);
+	
+    /**
+    * Destructor.
+    */
+	virtual ~CDMNativeNotifier();
+
+ public:
+	/**
+	* Function to list all the implementations
+	*/
+	static void ListImplementationsL(RImplInfoPtrArray& aImplInfoArray);
+
+ private:
+	// Instance identifier key
+	TUid iDtor_ID_Key;
+};
+
+#include "DMNativeNotifier.inl"
+
+#endif  // DMNATIVENOTIFIER_H
+
+//End of file
diff -r 3d85de3d90be -r 1b024573da70 remotemgmt_plat/dm_native_notifier_api/inc/DMNativeNotifier.inl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/remotemgmt_plat/dm_native_notifier_api/inc/DMNativeNotifier.inl	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,24 @@
+
+inline CDMNativeNotifier* CDMNativeNotifier::NewL(TUid aOperationId)
+    {  
+    
+    TAny* interface = REComSession::CreateImplementationL( aOperationId
+                                        ,_FOFF (CDMNativeNotifier, iDtor_ID_Key)); 
+    return reinterpret_cast <CDMNativeNotifier*> (interface);
+    
+    }
+
+inline CDMNativeNotifier::~CDMNativeNotifier()
+    {
+    REComSession::DestroyedImplementation (iDtor_ID_Key);    
+    }
+
+inline void CDMNativeNotifier::ListImplementationsL(RImplInfoPtrArray& aImplInfoArray)
+    {
+    _LIT8(KOperationName,"DialogEcom");
+    TEComResolverParams resolverParams;
+    resolverParams.SetDataType(KOperationName());
+    resolverParams.SetWildcardMatch(ETrue);     // Allow wildcard matching
+
+    REComSession::ListImplementationsL(KNotifierInterfaceUid,resolverParams,KRomOnlyResolverUid, aImplInfoArray);
+    }
diff -r 3d85de3d90be -r 1b024573da70 remotemgmt_plat/dm_native_notifier_api/inc/DMNativeNotifierInterface.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/remotemgmt_plat/dm_native_notifier_api/inc/DMNativeNotifierInterface.h	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,51 @@
+/*
+* 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 the License "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: M class for the Dm notifier interface.
+*     
+*/
+
+
+#ifndef DMNATIVENOTIFIERINTERFACE_H_
+#define DMNATIVENOTIFIERINTERFACE_H_
+
+#include <e32base.h>    // CBase  // TBuf
+#include <ecom/ecom.h>
+
+// The Ecom interface uid
+const TUid KNotifierInterfaceUid =  {0x2002BC4D};
+
+//Return types based on the user key press
+enum 
+    {
+    ESyncMLDlgRespKeyNone = -3, 
+    ESyncMLDlgRespKeyOk = -2, // all LSK
+    ESyncMLDlgRespKeyOthers = -1, //all call-termination key press fall here.
+    ESyncMLDlgRespKeyCancel= 0
+    };
+
+//Constants for showing the note
+enum TDmNoteType
+{
+    EPrivacyPolicy = 0
+};
+
+class MDMNativeNotifierInterface
+    {
+public:
+    virtual TInt ShowDialogL(TDmNoteType aNote)=0;
+    };
+
+
+
+#endif /* DMNATIVENOTIFIERINTERFACE_H_ */
diff -r 3d85de3d90be -r 1b024573da70 remotemgmt_plat/group/bld.inf
--- a/remotemgmt_plat/group/bld.inf	Mon Mar 08 21:44:11 2010 +0000
+++ b/remotemgmt_plat/group/bld.inf	Sun Mar 14 13:12:06 2010 +0000
@@ -55,3 +55,4 @@
 #include "../dcmo_adapter_api/group/bld.inf"
 #include "../dcmo_control_api/group/bld.inf"
 #include "../ds_capability_mgmt_plugin_api/group/bld.inf"
+#include "../dm_native_notifier_api/group/bld.inf"
diff -r 3d85de3d90be -r 1b024573da70 remotemgmt_plat/oma_ds_extensions_api/inc/nsmlchangefinder.h
--- a/remotemgmt_plat/oma_ds_extensions_api/inc/nsmlchangefinder.h	Mon Mar 08 21:44:11 2010 +0000
+++ b/remotemgmt_plat/oma_ds_extensions_api/inc/nsmlchangefinder.h	Sun Mar 14 13:12:06 2010 +0000
@@ -22,7 +22,7 @@
 //  INCLUDES
 #include <e32base.h>
 #include <nsmlsnapshotitem.h>
-#include <smldataprovider.h>
+#include <SmlDataProvider.h>
 
 // CONSTANTS
 const TInt KNSmlDefaultSnapshotStreamUID = 0x101F6DE4;
diff -r 3d85de3d90be -r 1b024573da70 remotemgmt_plat/syncml_notifier_api/inc/SyncMLNotifierParams.h
--- a/remotemgmt_plat/syncml_notifier_api/inc/SyncMLNotifierParams.h	Mon Mar 08 21:44:11 2010 +0000
+++ b/remotemgmt_plat/syncml_notifier_api/inc/SyncMLNotifierParams.h	Sun Mar 14 13:12:06 2010 +0000
@@ -20,6 +20,9 @@
 #ifndef SYNCMLNOTIFIERPARAMS_H
 #define SYNCMLNOTIFIERPARAMS_H
 
+#include <centralrepository.h>
+#include <schinfo.h>
+
 //  INCLUDES
 
 // CONSTANTS
@@ -86,7 +89,10 @@
     ESyncMLFwUpdOmaDLPostponed,	//Enum for Oma Download postponed
     ESyncMLFwUpdOmaDLCancelled, //Enum for Oma Download cancelled
     ESyncMLFwUpdOmaDLResume,        //Enum for Oma Download Resume
-    ESyncMLFwUpdStartQueryEnc      //Enum for starting installation on encrypted memory
+    ESyncMLFwUpdStartQueryEnc,      //Enum for starting installation on encrypted memory
+	ESyncMLFwUpdForceQuery,         // Forcing the update when the retry count for postponing the update expires.
+    ESyncMLFwUpdPostponeNote,        // The note that is to be shown when user postpones the udpate
+    ESyncMLFwUpdPostponeLimitQuery
 
     };
 
@@ -240,6 +246,12 @@
 	    TInt iMemoryNeeded;// Parameter to hold how much memory is to be
 	                       // freed for downloading the package.
 	    TBool iEncryptReq; //To tell if encrypt query should be shown to user.
+		TInt iFotaUserPostponeCount; // To determine the number of times user has postponed the update.
+	    TInt iFotaMaxPostponeCount; // The maximum number of times the update can be postponed.
+	    TBuf<KSyncMLMaxServerMsgLength> iSelectedReminder; // The option selected by the user to postpone the update.
+	    TIntervalType iIntervalType;
+	    TInt iInterval;
+	    
 	};
 
 /**
diff -r 3d85de3d90be -r 1b024573da70 syncmlfw/common/alertqueue/src/NSmlAlertHandler.cpp
--- a/syncmlfw/common/alertqueue/src/NSmlAlertHandler.cpp	Mon Mar 08 21:44:11 2010 +0000
+++ b/syncmlfw/common/alertqueue/src/NSmlAlertHandler.cpp	Sun Mar 14 13:12:06 2010 +0000
@@ -62,7 +62,7 @@
 	{
 
 	Cancel();
-	if( !iHistoryArray )
+	if( iHistoryArray )
 	{
 	iHistoryArray->SetOwnerShip( ETrue );
 	delete iHistoryArray;
diff -r 3d85de3d90be -r 1b024573da70 syncmlfw/common/alertqueue/src/NSmlDMAlertParser11.cpp
--- a/syncmlfw/common/alertqueue/src/NSmlDMAlertParser11.cpp	Mon Mar 08 21:44:11 2010 +0000
+++ b/syncmlfw/common/alertqueue/src/NSmlDMAlertParser11.cpp	Sun Mar 14 13:12:06 2010 +0000
@@ -18,6 +18,8 @@
 
 #include <centralrepository.h>
 #include <DevManInternalCRKeys.h>
+#include <e32property.h>
+#include <nsmldmconst.h>
 #include "NSmlAlertQueue.h"
 #include "nsmldebug.h" 
 // ---------------------------------------------------------
@@ -72,6 +74,14 @@
     delete centrep;
 	if( SanSupport == 1 )
    	{
+	if(uiMode == ESilent) //silent
+	    {
+        static _LIT_SECURITY_POLICY_PASS(KAllowAllPolicy);
+        static _LIT_SECURITY_POLICY_C1(KAllowWriteDeviceDataPolicy, ECapabilityWriteDeviceData);
+        RProperty::Define(KPSUidNSmlSOSServerKey,KNSmlDMSilentJob,RProperty::EInt,KAllowAllPolicy,KAllowWriteDeviceDataPolicy);
+        TInt r2=RProperty::Set(KPSUidNSmlSOSServerKey,KNSmlDMSilentJob,ESilent);
+        DBG_FILE_CODE( r2, _S8("CNSmlDMAlertParser11::ParseMessageL() KNSmlDMSilentJob set error code") );
+	    }
     iAlertInfo.SetUimode(uiMode);
    	}	
 	if (uiMode == 0)
diff -r 3d85de3d90be -r 1b024573da70 syncmlfw/common/http/bld/nsmlhttp.mmp
--- a/syncmlfw/common/http/bld/nsmlhttp.mmp	Mon Mar 08 21:44:11 2010 +0000
+++ b/syncmlfw/common/http/bld/nsmlhttp.mmp	Sun Mar 14 13:12:06 2010 +0000
@@ -72,5 +72,8 @@
 LIBRARY			ezlib.lib
 LIBRARY			connmon.lib
 LIBRARY         	connmonext.lib
-
+LIBRARY  		extendedconnpref.lib 
+LIBRARY  		netmeta.lib 
+LIBRARY 		etel.lib
+LIBRARY 		etelmm.lib
 SMPSAFE
diff -r 3d85de3d90be -r 1b024573da70 syncmlfw/common/http/inc/nsmldialiap.h
--- a/syncmlfw/common/http/inc/nsmldialiap.h	Mon Mar 08 21:44:11 2010 +0000
+++ b/syncmlfw/common/http/inc/nsmldialiap.h	Sun Mar 14 13:12:06 2010 +0000
@@ -23,7 +23,7 @@
 #include <commdb.h>
 #include <cdbstore.h>
 #include <in_iface.h>
-
+#include <extendedconnpref.h>
 #include <nifman.h>
 #include <connectprog.h>
 #include <commdbconnpref.h>
@@ -40,7 +40,7 @@
 
 	public:
 		CNSmlDialUpAgent();
-		void ConstructL();
+		void ConstructL(TBool aDmJob);
 		void ConnectL( CArrayFixFlat<TUint32>* aIAPIdArray, TRequestStatus &aStatus );
 		~CNSmlDialUpAgent();
 	
@@ -54,13 +54,12 @@
 		void StartDatacallL();
 		void AttachToConnectionL();
 		TBool IsInOfflineModeL();
+		void IsRoamingL(TBool& aRoaming);
 	private:
 		TRequestStatus* iEngineStatus;
 		RConnection iConnection;
 		RSocketServ iSocketServer;
-
-		TUint iIAPid;
-		TCommDbConnPref iPref;
+		TUint iIAPid;		
 		TBool iCancelCalled;
 		TBool iSocketConnection;
         CArrayFixFlat<TUint32>* iIAPArray;
@@ -69,6 +68,9 @@
         TBool iTimerReturn;
         TInt iRetryCounter;
         RTimer iTimer;
+        TConnPrefList iPrefList;
+        TExtendedConnPref iExtPrefs;
+		TBool iDmjob;
 
 	private:
 		friend class CNSmlHTTP;
diff -r 3d85de3d90be -r 1b024573da70 syncmlfw/common/http/src/nsmldialiap.cpp
--- a/syncmlfw/common/http/src/nsmldialiap.cpp	Mon Mar 08 21:44:11 2010 +0000
+++ b/syncmlfw/common/http/src/nsmldialiap.cpp	Sun Mar 14 13:12:06 2010 +0000
@@ -20,8 +20,13 @@
 #include <featmgr.h>   // FeatureManager
 #include <cmdefconnvalues.h>
 #include <cmmanager.h>
-#include <ApUtils.h>
+#include <cmmanagerkeys.h>
+#include <rconnmon.h>
+#include <nsmldmconst.h>
+#include <nsmlconstants.h>
 #include <etelpckt.h>
+#include <etel.h> //for telephone mode
+#include <etelmm.h> //for telephone mode
 #include "nsmldialiap.h"
 #include <nsmlconstants.h>
 #include "nsmlerror.h"
@@ -53,12 +58,13 @@
 // CNSmlDialUpAgent::ConstructL()
 // 2-phase
 // --------------------------------------------------------------------
-void CNSmlDialUpAgent::ConstructL()
+void CNSmlDialUpAgent::ConstructL(TBool aDmJob)
     {
 	DBG_FILE( _S8("CNSmlDialUpAgent::ConstructL") );
 	CActiveScheduler::Add( this );
 	iCancelCalled = EFalse;    
-	iSocketConnection = EFalse;    
+	iSocketConnection = EFalse;  
+	iDmjob = aDmJob;
 	FeatureManager::InitializeLibL();  
 	}
 //------------------------------------------------------------
@@ -263,20 +269,7 @@
     User::LeaveIfError( iSocketServer.Connect() );		
     User::LeaveIfError( iConnection.Open( iSocketServer ) );
     iSocketConnection = ETrue;
-    if ( static_cast<TInt32>(iIAPid) == -1 )
-        {
-        iConnection.Start( iPref, iStatus );
-        }
-    else if( static_cast<TInt32>(iIAPid) == -2 ) // default connection 
-        {
-
-        iConnection.Start( iStatus );	
-
-        }
-    else
-        {
-        iConnection.Start( iPref, iStatus );
-        }
+    iConnection.Start( iPrefList, iStatus );
     }
 	
 // ---------------------------------------------------------
@@ -377,33 +370,110 @@
 void CNSmlDialUpAgent::DoSettingsL()
     {
     DBG_FILE( _S8("CNSmlDialUpAgent::DoSettingsL") );
-    iOffline=IsInOfflineModeL();
-    if( static_cast<TInt32>(iIAPid) == -1 )
-        {		
-        if(iOffline)
-            {		
-            iPref.SetDialogPreference( ECommDbDialogPrefPrompt );
-            iPref.SetBearerSet(EApBearerTypeWLAN);	
+    iOffline=IsInOfflineModeL();            
+    iExtPrefs.SetForcedRoaming(EFalse);
+    if(  ( static_cast<TInt32>(iIAPid) == -2 ) || 
+            static_cast<TInt32>(iIAPid) == -1 ) // default connection
+        {
+        TBool Snap = EFalse;
+        RCmManager cmmgr;
+        cmmgr.OpenL();
+        TCmDefConnValue defConnValue;
+        cmmgr.ReadDefConnL(defConnValue);
+        cmmgr.Close();
+        if(defConnValue.iType == ECmDefConnDestination)
+            {
+            iExtPrefs.SetSnapId(defConnValue.iId);
+            Snap = ETrue;
+            }
+        else if(defConnValue.iType == ECmDefConnConnectionMethod)
+            {
+            iExtPrefs.SetIapId(defConnValue.iId);   
             }
-        else
-            {		
-            iPref.SetDialogPreference( ECommDbDialogPrefPrompt );		
-            iPref.SetBearerSet(EApBearerTypeAllBearers);
-            }				
-        }
-    else if( iOffline &&  ( static_cast<TInt32>(iIAPid) == -2 ) ) // default connection
-        {
-        iPref.SetDialogPreference( ECommDbDialogPrefPrompt );
-        iPref.SetBearerSet(EApBearerTypeWLAN);	
+            iExtPrefs.SetConnSelectionDialog(EFalse);
+        if(iDmjob)
+            {            
+            TInt val = KErrNotFound;
+            TInt r2=RProperty::Get(KPSUidNSmlSOSServerKey,KNSmlDMSilentJob,val);
+			DBG_FILE_CODE( r2, _S8("CNSmlDialUpAgent::DoSettingsL dc KNSmlDMSilentJob set error code") );
+            if(val == ESilent) //silent session
+                {
+                //Check the cenrep key
+                TInt currentmode = KErrNone;
+                CRepository* rep = CRepository::NewLC( KCRUidCmManager );
+                rep->Get(KCurrentCellularDataUsage, currentmode );
+                CleanupStack::PopAndDestroy(); //rep
+                //if "Always ask", check the roam or home
+                // if snap dont allow silent connections at all in"always ask"
+                if(Snap)//Check also for roaming n/w IAP as d.c case
+                    {
+                    //Check the general settings                
+                    if(ECmCellularDataUsageConfirm ==  currentmode)
+                        {
+                        //As silent session fails in roam or home with snap, then dont go for silent sessions .
+                        iExtPrefs.SetNoteBehaviour(TExtendedConnPref::ENoteBehaviourDefault  );
+                        }
+                    else
+                        {
+                        iExtPrefs.SetNoteBehaviour(TExtendedConnPref::ENoteBehaviourConnSilent );
+                        }
+                    }
+                else //IAP as d.c
+                    {
+
+                    //dont set any preference, as this leads to fail  
+                    //else //home n/w or roam n/w with automatic or WLAN only
+                    TBool roaming = EFalse;
+                    IsRoamingL(roaming);
+                    if(ECmCellularDataUsageConfirm ==  currentmode && roaming)
+                        {
+                        //No silent connection preference, as this leads to failure of connection
+                        iExtPrefs.SetNoteBehaviour(TExtendedConnPref::ENoteBehaviourDefault  );
+                        }
+                    else
+                        iExtPrefs.SetNoteBehaviour(TExtendedConnPref::ENoteBehaviourConnSilent );
+                    }
+                RProperty::Set(KPSUidNSmlSOSServerKey,KNSmlDMSilentJob,KErrNone);
+                }
+            }
         }
     else
         {
-        iPref.SetIapId( iIAPid );
-        iPref.SetDialogPreference( ECommDbDialogPrefDoNotPrompt );
+        iExtPrefs.SetIapId(iIAPid);
+        iExtPrefs.SetConnSelectionDialog(EFalse);
+        if(iDmjob)
+            {
+            TInt val = KErrNotFound;
+            TInt r2=RProperty::Get(KPSUidNSmlSOSServerKey,KNSmlDMSilentJob,val);
+			DBG_FILE_CODE( r2, _S8("CNSmlDialUpAgent::DoSettingsL IAP KNSmlDMSilentJob set error code") );
+            if(val == ESilent) //silent session
+               {
+                //Check the cenrep key
+                TInt currentmode = KErrNone;
+                CRepository* rep = CRepository::NewLC( KCRUidCmManager );
+                rep->Get(KCurrentCellularDataUsage, currentmode );
+                CleanupStack::PopAndDestroy(); //rep          
+                TBool roaming = EFalse;
+                IsRoamingL(roaming);  
+                if(ECmCellularDataUsageConfirm ==  currentmode && roaming )
+                    {
+                    //As silent session fails in roam or home with snap, then dont go for silent sessions .
+                    iExtPrefs.SetNoteBehaviour(TExtendedConnPref::ENoteBehaviourDefault  );
+                    }
+                else
+                    {
+                    iExtPrefs.SetNoteBehaviour(TExtendedConnPref::ENoteBehaviourConnSilent );
+                    }
+               }
+            }
+        RProperty::Set(KPSUidNSmlSOSServerKey,KNSmlDMSilentJob,KErrNone);
         }
+    iPrefList.AppendL(&iExtPrefs);
+
     }
 //----------------------------------------------------------
 //CNsmlDialUpAgent::IsOfflineModeL()
+//------------------------------------------------------------	
 TBool CNSmlDialUpAgent::IsInOfflineModeL()
     {
     TInt operationsAllowed( ECoreAppUIsNetworkConnectionAllowed );
@@ -413,3 +483,67 @@
 	
     return ( operationsAllowed == ECoreAppUIsNetworkConnectionNotAllowed ) ? ETrue : EFalse;
     }
+
+//------------------------------------------------------------
+// CNSmlDialUpAgent::IsRoamingL()
+//  Returns roaming network or not
+//------------------------------------------------------------	
+void CNSmlDialUpAgent::IsRoamingL( TBool& aRoaming)
+    {
+     	RTelServer telServer;
+	User::LeaveIfError( telServer.Connect());
+	
+	RTelServer::TPhoneInfo teleinfo;
+	User::LeaveIfError( telServer.GetPhoneInfo( 0, teleinfo ) );
+	
+	RMobilePhone phone;
+	User::LeaveIfError( phone.Open( telServer, teleinfo.iName ) );
+	
+	User::LeaveIfError(phone.Initialise());	
+	
+	RMobilePhone::TMobilePhoneNetworkMode mode;        	        	
+	TInt err = phone.GetCurrentMode( mode );
+	phone.Close();
+	telServer.Close();
+	TInt Bearer = EBearerIdGSM ;
+	if( KErrNone == err )
+		{
+		switch(mode)
+		{
+		case RMobilePhone::ENetworkModeGsm:		
+			{
+			Bearer = EBearerIdGSM; 			
+			break;		
+			}
+		case RMobilePhone::ENetworkModeWcdma:
+			{                		     		
+			Bearer = EBearerIdWCDMA  ;			
+			}	
+		default: 
+			{       			
+			break;
+			}        				
+		}
+	}	
+    RConnectionMonitor monitor;
+    TRequestStatus status;
+    // open RConnectionMonitor object
+    monitor.ConnectL();
+    CleanupClosePushL( monitor );
+    TInt netwStatus(0);
+    monitor.GetIntAttribute( Bearer, 
+            0, 
+            KNetworkRegistration,
+            netwStatus, 
+            status );
+    User::WaitForRequest( status );
+    CleanupStack::PopAndDestroy(); // Destroying monitor
+    if ( status.Int() == KErrNone && netwStatus == ENetworkRegistrationRoaming )
+        {
+        aRoaming = ETrue;
+        }
+    else //home n/w or some other state in n/w
+        {
+        aRoaming = EFalse;
+        }
+}
diff -r 3d85de3d90be -r 1b024573da70 syncmlfw/common/http/src/nsmlhttp.cpp
--- a/syncmlfw/common/http/src/nsmlhttp.cpp	Mon Mar 08 21:44:11 2010 +0000
+++ b/syncmlfw/common/http/src/nsmlhttp.cpp	Sun Mar 14 13:12:06 2010 +0000
@@ -82,6 +82,7 @@
 	{
 	// construct shutdown timer
 	DBG_FILE(_S8("CNSmlHTTP::ConstructL BEGIN"));
+	TBool dmjob = EFalse;
 	FeatureManager::InitializeLibL();
 	iShutdown = new (ELeave) CNSmlXptShutdownTimer( this );
 	iShutdown->ConstructL();
@@ -92,6 +93,7 @@
     DBG_FILE_CODE(session, _S8("CNSmlHTTP::ConstructL Current Session is (DM = 2, DS = 1) "));
     if( session == ESyncMLDMSession )//for dm session
        {
+       dmjob = ETrue;
 		TInt dmsessionTimeout = -1;
 		CRepository *rep = NULL;
 		TRAPD( err1, rep = CRepository::NewL( KCRUidDeviceManagementInternalKeys ))
@@ -123,7 +125,7 @@
     RProperty::Get( KPSUidNSmlSOSServerKey, KNSmlSyncJobOngoing, iSession);                       
 	// construct dialup agent
 	iDialUpAgent = new (ELeave) CNSmlDialUpAgent();
-	iDialUpAgent->ConstructL();
+	iDialUpAgent->ConstructL(dmjob);
 
 	iEngineState = ExptIdle;
 	iTimeOut = EFalse;
diff -r 3d85de3d90be -r 1b024573da70 syncmlfw/common/inc/nsmloperatordefines.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/syncmlfw/common/inc/nsmloperatordefines.h	Sun Mar 14 13:12:06 2010 +0000
@@ -0,0 +1,36 @@
+/*
+* Copyright (c) 2007 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:  Operator specific defenitions
+*
+*/
+
+#ifndef NSMLOPERATORDEFINES_H_
+#define NSMLOPERATORDEFINES_H_
+
+//CONSTANTS
+#define KBufferLength 256
+
+_LIT(KSpace," ");
+
+const TUid KNsmlOperatorCenrepUID = {0x2002682E};
+
+const TInt KNsmlOperatorProfileServerId = 0x01;
+const TInt KNsmlExtendedServerStatusCodeList = 0x02;
+const TInt KNsmlExtendedServerStatusCode = 0x03;
+const TInt KNsmlOperatorDevInfExtXNam = 0x04;
+const TInt KNsmlOperatorDevInfExtXVal = 0x05;
+
+#endif //NSMLOPERATORDEFINES_H_ 
+
+// End of File
diff -r 3d85de3d90be -r 1b024573da70 syncmlfw/common/sosserver/src/nsmlsossession.cpp
--- a/syncmlfw/common/sosserver/src/nsmlsossession.cpp	Mon Mar 08 21:44:11 2010 +0000
+++ b/syncmlfw/common/sosserver/src/nsmlsossession.cpp	Sun Mar 14 13:12:06 2010 +0000
@@ -461,6 +461,7 @@
     if ( !iDMAuthInfo )
         {
         aMessage.Complete( KErrNotFound );
+        return;
         }
     aMessage.WriteL( 0, iDMAuthInfo->Ptr(0), 0 );
     aMessage.Complete( KErrNone );
@@ -1545,6 +1546,7 @@
     if ( !log )
         {
         aMessage.Complete( KErrBadHandle );
+        return;
         }
     log->ResetL();
     aMessage.Complete(KErrNone);
@@ -2233,16 +2235,16 @@
             break;               
             };
         
-	   	        
-        if ( iHandler->CompleteBufProgressMsg( *buf, this )) // if owner not found do not remove from buffer
-            {
-            iProgressEventBuffer.Remove(0);        
-            }  
-            
-        delete buf;
-        buf = NULL;   
-        
-        
+	   	if ( buf )  
+	   	    { 
+                if ( iHandler->CompleteBufProgressMsg( *buf, this )) // if owner not found do not remove from buffer
+                    {
+                    iProgressEventBuffer.Remove(0);        
+                    }  
+                    
+                delete buf;
+                buf = NULL; 
+	   	    }   
         }
     
     if ( !mutexError )
@@ -2307,14 +2309,16 @@
             iProgressEventBuffer.Remove(0);        
             }  
         */
-		if ( iHandler->CompleteBufContactSuiteProgressMsg( *buf, this )) // if owner not found do not remove from buffer
-            {
-            iContactSuiteProgressEventBuffer.Remove(0);        
-            }  
+        if ( buf ) 
+          {     
+            if ( iHandler->CompleteBufContactSuiteProgressMsg( *buf, this )) // if owner not found do not remove from buffer
+                {
+                    iContactSuiteProgressEventBuffer.Remove(0);        
+                }  
 
-        delete buf;
-        buf = NULL;   
-        
+            delete buf;
+            buf = NULL;   
+          } 
         
         }
     
diff -r 3d85de3d90be -r 1b024573da70 syncmlfw/common/syncagent/src/NSmlAgentBase.cpp
--- a/syncmlfw/common/syncagent/src/NSmlAgentBase.cpp	Mon Mar 08 21:44:11 2010 +0000
+++ b/syncmlfw/common/syncagent/src/NSmlAgentBase.cpp	Sun Mar 14 13:12:06 2010 +0000
@@ -1900,7 +1900,10 @@
 	if(iPacketDataUnAvailable)
 	{
 		DBG_FILE(_S8("CNSmlAgentBase::FinaliseWhenErrorL Prompting for a Dialog"));
-		iError->SetErrorCode( TNSmlError::ESmlCommunicationError);		
+		if (iError)
+			{
+			iError->SetErrorCode( TNSmlError::ESmlCommunicationError);		
+			}
 		User::RequestComplete( iCallerStatus, TNSmlError::ESmlCommunicationError );
 	}
 	//RD_AUTO_RESTART
diff -r 3d85de3d90be -r 1b024573da70 syncmlfw/conf/devman.confml
Binary file syncmlfw/conf/devman.confml has changed
diff -r 3d85de3d90be -r 1b024573da70 syncmlfw/conf/devman_101F9A0A.crml
Binary file syncmlfw/conf/devman_101F9A0A.crml has changed
diff -r 3d85de3d90be -r 1b024573da70 syncmlfw/conf/nsmloperatorsettings.confml
Binary file syncmlfw/conf/nsmloperatorsettings.confml has changed
diff -r 3d85de3d90be -r 1b024573da70 syncmlfw/conf/nsmloperatorsettings_2002682E.crml
Binary file syncmlfw/conf/nsmloperatorsettings_2002682E.crml has changed
diff -r 3d85de3d90be -r 1b024573da70 syncmlfw/dm/dmnetworkmon/src/DMNetworkMon.cpp
--- a/syncmlfw/dm/dmnetworkmon/src/DMNetworkMon.cpp	Mon Mar 08 21:44:11 2010 +0000
+++ b/syncmlfw/dm/dmnetworkmon/src/DMNetworkMon.cpp	Sun Mar 14 13:12:06 2010 +0000
@@ -17,7 +17,8 @@
 
 // USER INCLUDES
 #include "DMNetworkMon.h"
-
+#include <e32property.h>
+#include <nsmldmconst.h>
 #include <SyncMLClient.h>
 #include <SyncMLClientDM.h>
 #include <nsmldmauthinfo.h>
@@ -494,6 +495,11 @@
             TLex gavalue(genalertap);
             gavalue.Val(IAPID);
             LOGSTRING("DM JOB CREATED");
+            static _LIT_SECURITY_POLICY_PASS(KAllowAllPolicy);
+            static _LIT_SECURITY_POLICY_C1(KAllowWriteDeviceDataPolicy, ECapabilityWriteDeviceData);
+            RProperty::Define(KPSUidNSmlSOSServerKey,KNSmlDMSilentJob,RProperty::EInt,KAllowAllPolicy,KAllowWriteDeviceDataPolicy);
+           TInt r2=RProperty::Set(KPSUidNSmlSOSServerKey,KNSmlDMSilentJob,ESilent);
+           DBG_FILE_CODE(aError, _S8("CDMNetworkMon::RunError() KNSmlDMSilentJob get error code "));
             TRAPD(err, dmJob.CreateL( iSyncSession, ProfileId, IAPID));
             LOGSTRING("DM JOB CREATED END");
             if(err!=KErrNone)
diff -r 3d85de3d90be -r 1b024573da70 syncmlfw/dm/settings/conf/factorydmprofiles.confml
Binary file syncmlfw/dm/settings/conf/factorydmprofiles.confml has changed
diff -r 3d85de3d90be -r 1b024573da70 syncmlfw/dm/settings/inc/DMprofileContentHandler.h
--- a/syncmlfw/dm/settings/inc/DMprofileContentHandler.h	Mon Mar 08 21:44:11 2010 +0000
+++ b/syncmlfw/dm/settings/inc/DMprofileContentHandler.h	Sun Mar 14 13:12:06 2010 +0000
@@ -23,7 +23,7 @@
 #include <e32std.h>
 #include <f32file.h>
 #include "mxmlattributes.h"
-#include "MXMLContentHandler.h"
+#include "mxmlcontenthandler.h"
 #include "NSmlDMResourceProfile.h"
 
 const TInt KNSmlDmFileNameLength=255;
diff -r 3d85de3d90be -r 1b024573da70 syncmlfw/dm/settings/src/NSmlDMSettings.cpp
--- a/syncmlfw/dm/settings/src/NSmlDMSettings.cpp	Mon Mar 08 21:44:11 2010 +0000
+++ b/syncmlfw/dm/settings/src/NSmlDMSettings.cpp	Sun Mar 14 13:12:06 2010 +0000
@@ -29,7 +29,7 @@
 #include "bautils.h"
 #include "NSmlDMResourceProfile.h"
 #include "DMprofileContentHandler.h"
-#include "RXMLReader.h"
+#include "rxmlreader.h"
 #include <centralrepository.h>
 #include "DevManInternalCRKeys.h"
 
diff -r 3d85de3d90be -r 1b024573da70 syncmlfw/dm/syncagent/src/nsmldmagent.cpp
--- a/syncmlfw/dm/syncagent/src/nsmldmagent.cpp	Mon Mar 08 21:44:11 2010 +0000
+++ b/syncmlfw/dm/syncagent/src/nsmldmagent.cpp	Sun Mar 14 13:12:06 2010 +0000
@@ -1374,7 +1374,10 @@
 		TTime now;
 		//now.HomeTime();//previously using
 		now.UniversalTime();
+		if(iError)
 		iSyncLog->SetResult(now, iError->SyncLogErrorCode());
+		else
+		iSyncLog->SetResult(now, KErrGeneral);   
 
 			CNSmlDMSettings* settings = CNSmlDMSettings::NewLC();
 			CNSmlDMProfile* profile = settings->ProfileL( iProfileID );
diff -r 3d85de3d90be -r 1b024573da70 syncmlfw/ds/agentlog/src/nsmlagentlog.cpp
--- a/syncmlfw/ds/agentlog/src/nsmlagentlog.cpp	Mon Mar 08 21:44:11 2010 +0000
+++ b/syncmlfw/ds/agentlog/src/nsmlagentlog.cpp	Sun Mar 14 13:12:06 2010 +0000
@@ -1457,37 +1457,57 @@
 						break;
 
 						case ESourceRef:
-							dbCaps->SetSourceRefL(ptrStringPart);
-								
+						    if (dbCaps)
+						        {
+							    dbCaps->SetSourceRefL(ptrStringPart);
+						        }							
 						break;
 
 						case EDisplayName:
-							dbCaps->SetDisplayNameL(ptrStringPart);
+						    if (dbCaps)
+						        {
+							    dbCaps->SetDisplayNameL(ptrStringPart);
+						        }
 						break;
 
 						case EMaxGUIDSize:
-							dbCaps->SetMaxGuidSizeL(ptrStringPart);
+						    if (dbCaps)
+						        {
+							    dbCaps->SetMaxGuidSizeL(ptrStringPart);
+						        }
 						break;
 
 						case ERxPref:
 							separator = ptrStringPart.Locate(KTabSeparator()[0]);
-							dbCaps->SetRxPrefL(ptrStringPart.Left(separator),ptrStringPart.Right(ptrStringPart.Length()-separator-1));
+							if (dbCaps)
+							   {
+							   dbCaps->SetRxPrefL(ptrStringPart.Left(separator),ptrStringPart.Right(ptrStringPart.Length()-separator-1));
+							   }
 						break;
 
 						case ERx:
 							separator = ptrStringPart.Locate(KTabSeparator()[0]);
-							dbCaps->AddRxL(ptrStringPart.Left(separator),ptrStringPart.Right(ptrStringPart.Length()-separator-1));
+							if (dbCaps)
+							   {
+							   dbCaps->AddRxL(ptrStringPart.Left(separator),ptrStringPart.Right(ptrStringPart.Length()-separator-1));
+							   }
 						break;
 
 						case ETxPref:
 							separator = ptrStringPart.Locate(KTabSeparator()[0]);
-							dbCaps->SetTxPrefL(ptrStringPart.Left(separator),ptrStringPart.Right(ptrStringPart.Length()-separator-1));
+							if (dbCaps)
+							   {
+							   dbCaps->SetTxPrefL(ptrStringPart.Left(separator),ptrStringPart.Right(ptrStringPart.Length()-separator-1));
+							   }
 						break;
 
 
 						case ETx:
 							separator = ptrStringPart.Locate(KTabSeparator()[0]);
-							dbCaps->AddTxL(ptrStringPart.Left(separator),ptrStringPart.Right(ptrStringPart.Length()-separator-1));
+							if (dbCaps)
+							    {
+							    dbCaps->AddTxL(ptrStringPart.Left(separator),ptrStringPart.Right(ptrStringPart.Length()-separator-1));
+							    }
 						break;
 
 
@@ -1495,7 +1515,10 @@
 						break;
 
 						case ESupportHierarchicalSync:
-							dbCaps->SetSupportHierarchicalSyncL();
+						    if (dbCaps)
+						       {
+							    dbCaps->SetSupportHierarchicalSyncL();
+						       }
 						break;
 
 						case ESyncCap:
diff -r 3d85de3d90be -r 1b024573da70 syncmlfw/ds/provisioningadapter/inc/NSmlDsProvisioningAdapter.h
--- a/syncmlfw/ds/provisioningadapter/inc/NSmlDsProvisioningAdapter.h	Mon Mar 08 21:44:11 2010 +0000
+++ b/syncmlfw/ds/provisioningadapter/inc/NSmlDsProvisioningAdapter.h	Sun Mar 14 13:12:06 2010 +0000
@@ -54,6 +54,7 @@
 _LIT( KNSmlDsPovisioningDirAndResource,	"z:NSmlDsProvisioningAdapter.rsc" );
 
 _LIT( KNSmlDsDefaultPort, "80");
+_LIT( KNSmlDsHTTPSDefaultPort, "443");
 _LIT(KNSmlVersion12, "1.2");
 _LIT(KNSmlVersion112, "1.1.2");
 _LIT(KNSmlVersion11, "1.1");
diff -r 3d85de3d90be -r 1b024573da70 syncmlfw/ds/provisioningadapter/src/NSmlDsProvisioningAdapter.cpp
--- a/syncmlfw/ds/provisioningadapter/src/NSmlDsProvisioningAdapter.cpp	Mon Mar 08 21:44:11 2010 +0000
+++ b/syncmlfw/ds/provisioningadapter/src/NSmlDsProvisioningAdapter.cpp	Sun Mar 14 13:12:06 2010 +0000
@@ -290,13 +290,15 @@
 		// see if address contains also port
 		TBool portFound = EFalse;
 		TInt startPos(0);
+		TBool isHTTPS = EFalse;
 		if(iProfiles[aItem]->iHostAddress->Find(KNSmlDsProvisioningHTTP)==0)
 		    {
 		    startPos=KNSmlDsProvisioningHTTP().Length();		    		    
 		    }
 		else if(iProfiles[aItem]->iHostAddress->Find(KNSmlDsProvisioningHTTPS)==0)
 		    {
-		    startPos=KNSmlDsProvisioningHTTPS().Length();		    		    
+		    startPos=KNSmlDsProvisioningHTTPS().Length();	
+		    isHTTPS = ETrue;
 		    }
 		TPtrC uriPtr = iProfiles[aItem]->iHostAddress->Mid(startPos);
 		
@@ -327,9 +329,18 @@
 				}
 			else
 				{
+				TBuf<16> portNum;
+				if (isHTTPS)
+				    {
+				    portNum.Copy(KNSmlDsHTTPSDefaultPort());
+				    }
+				else
+				    {
+				    portNum.Copy(KNSmlDsDefaultPort());
+				    }
 				// use default port
 				if( CombineURILC( iProfiles[aItem]->iHostAddress->Des(),
-							  KNSmlDsDefaultPort(), uri ) == KErrNone )
+				        portNum, uri ) == KErrNone )
 					{
 					if(iProfiles[aItem]->iHostAddress)
 					{
diff -r 3d85de3d90be -r 1b024573da70 syncmlfw/ds/settings/inc/NSmlProfileContentHandler.h
--- a/syncmlfw/ds/settings/inc/NSmlProfileContentHandler.h	Mon Mar 08 21:44:11 2010 +0000
+++ b/syncmlfw/ds/settings/inc/NSmlProfileContentHandler.h	Sun Mar 14 13:12:06 2010 +0000
@@ -25,7 +25,7 @@
 #include <f32file.h>
 #include <eikenv.h> //JIM is this needed ??
 #include "mxmlattributes.h"
-#include "MXMLContentHandler.h"
+#include "mxmlcontenthandler.h"
 
 #include "nsmldssettings.h"
 //#include "nsmldsresourceprofiledefs.h"
diff -r 3d85de3d90be -r 1b024573da70 syncmlfw/ds/settings/src/NSmlDSSettings.cpp
--- a/syncmlfw/ds/settings/src/NSmlDSSettings.cpp	Mon Mar 08 21:44:11 2010 +0000
+++ b/syncmlfw/ds/settings/src/NSmlDSSettings.cpp	Sun Mar 14 13:12:06 2010 +0000
@@ -26,7 +26,7 @@
 #include "bautils.h"
 #include "nsmlroam.h"
 //XML profiles
-#include "RXMLReader.h"
+#include "rxmlreader.h"
 #include "NSmlProfileContentHandler.h"
 #include <centralrepository.h> //CRepository
 
diff -r 3d85de3d90be -r 1b024573da70 syncmlfw/ds/syncagent/bld/nsmldsagent.mmp
--- a/syncmlfw/ds/syncagent/bld/nsmldsagent.mmp	Mon Mar 08 21:44:11 2010 +0000
+++ b/syncmlfw/ds/syncagent/bld/nsmldsagent.mmp	Sun Mar 14 13:12:06 2010 +0000
@@ -82,6 +82,7 @@
 LIBRARY         nsmlfilter.lib
 LIBRARY			nsmldshostclient.lib
 LIBRARY			nsmlhistorylog.lib
+LIBRARY			featmgr.lib
 //RD_AUTO_RESTART
 LIBRARY 		ConnMon.lib
 LIBRARY        	connmonext.lib
diff -r 3d85de3d90be -r 1b024573da70 syncmlfw/ds/syncagent/inc/NSmlDSAgent.h
--- a/syncmlfw/ds/syncagent/inc/NSmlDSAgent.h	Mon Mar 08 21:44:11 2010 +0000
+++ b/syncmlfw/ds/syncagent/inc/NSmlDSAgent.h	Sun Mar 14 13:12:06 2010 +0000
@@ -37,7 +37,7 @@
 //RD_AUTO_RESTART
 class CNsmlDSNetmon;
 class CNSmlDSProfile;
-
+class CRepository;
 // CLASS DECLARATION
 
 /**
@@ -501,6 +501,8 @@
 	TNSmlSyncSuspendedState CurrentStateInServerAlertNext();
 	
 	TBool SyncFailure();
+	void StoreServerStatusCode(TInt aServerStatusCode) const;
+	void InitializeServerStatusCodeList();
 	public:
 	/**
 	* Mapping of the Alert code is done
@@ -574,6 +576,10 @@
 	TBool iAutoRestartInitiatedSync;
 	//RD_SUSPEND_RESUME
 	TBool iUpdateLastAnchor;
+	//For storing Server Status Code
+	CRepository* iRepositorySSC;
+	RArray<TInt>* iServerStatusCodeArray;
+	TBool iIsExtendedServerErrorCodesSupported;
 	};
 	
 typedef CNSmlDSAgent* (*TNSmlCreateDSAgentFunc) ( MSyncMLProgressObserver* aObserver );
diff -r 3d85de3d90be -r 1b024573da70 syncmlfw/ds/syncagent/inc/NSmlDSCmds.h
--- a/syncmlfw/ds/syncagent/inc/NSmlDSCmds.h	Mon Mar 08 21:44:11 2010 +0000
+++ b/syncmlfw/ds/syncagent/inc/NSmlDSCmds.h	Sun Mar 14 13:12:06 2010 +0000
@@ -315,6 +315,14 @@
 		* @result KErrNone if the conversion succeeded.
 		*/
 		TInt ConvertUid( const TDesC8& aLiteralUid, TSmlDbItemUid& aNumericUid );
+		
+		/*
+		 * Adds operator specific extension devInf fields XNam and XVal
+		 * Currently only one XNam and one corresponding XVal value are supported
+		 * These two values are read from central repository 0x2002682E (defined in nsmloperatordefines.h)
+		 * from keys KNsmlOperatorDevInfExtXNam (0x04) and KNsmlOperatorDevInfExtXVal (0x05)
+		 */
+		void InsertOperatorExtensionDevInfFieldsL( SmlDevInfDevInfPtr_t& aDevInf );
 
 	private: // data	
 		// batched items buffer
diff -r 3d85de3d90be -r 1b024573da70 syncmlfw/ds/syncagent/src/nsmldsagent.cpp
--- a/syncmlfw/ds/syncagent/src/nsmldsagent.cpp	Mon Mar 08 21:44:11 2010 +0000
+++ b/syncmlfw/ds/syncagent/src/nsmldsagent.cpp	Sun Mar 14 13:12:06 2010 +0000
@@ -47,6 +47,8 @@
 #include <centralrepository.h> 
 #include "SyncMLErr.h"
 #include "nsmldsconstants.h"
+#include <featmgr.h>
+#include "nsmloperatordefines.h"
 //RD_AUTO_RESTART
 _LIT( KNetMon,"\\netmon.exe" );
 _LIT( KAutoRestart,"netmon" );
@@ -119,8 +121,15 @@
                        RProperty::EInt, // type
                        KNSmlPSReadPolicy, // read policy
                        KNSmlPSWritePolicy ); // write policy
-	DBG_FILE(_S8("CNSmlDSAgent::ConstructL ends"));                        
-	
+
+	//For Syncml Status Extended Error Codes
+	FeatureManager::InitializeLibL();
+	iIsExtendedServerErrorCodesSupported = EFalse;
+	if(FeatureManager::FeatureSupported(KFeatureIdFfSyncmlStatusExtendedErrorCodes))
+	  {
+      InitializeServerStatusCodeList();
+	  }
+	DBG_FILE(_S8("CNSmlDSAgent::ConstructL ends"));
 	}
 
 // -----------------------------------------------------------------------------
@@ -159,8 +168,17 @@
 	{
 		delete iDSNetmon;		
 		iDSNetmon = NULL;
-	}	
-	//RD_AUTO_RESTART	
+	}
+    //RD_AUTO_RESTART
+	if(iServerStatusCodeArray)
+	    {
+	    delete iServerStatusCodeArray;
+	    }
+	if(iRepositorySSC)
+	    {
+	    delete iRepositorySSC;
+	    }
+	FeatureManager::UnInitializeLib();
 	}
 
 // -----------------------------------------------------------------------------
@@ -1541,7 +1559,10 @@
 			iSyncMLCmds = CNSmlDSCmds::NewL( this, sessionIdString, KNSmlDSAgentVerProto12, KNSmlSyncMLPublicId12, *iSyncMLUserName, iSyncServer, *iDSContent, *iDSObserver, versionCheck );		
 			}
 			
-	    TInt value(0);
+	    TInt value(0); 
+		if ( !iSyncMLCmds ) 
+		   User::Leave( KErrGeneral );
+		
 	    TRAPD (err , ReadRepositoryL(KNSmlMaxMsgSizeKey, value));	    
 	    if ( ( iMediumType == KUidNSmlMediumTypeInternet ) && ( err == KErrNone ) )
 	        {
@@ -1627,7 +1648,22 @@
 	iSyncHTTPAuthPassword = profile->StrValue( EDSProfileHttpAuthPassword ).AllocL();	
 	iSyncHTTPAuthUsed = profile->IntValue( EDSProfileHttpAuthUsed );						
 	iProtocolVer = static_cast<TSmlProtocolVersion>( profile->IntValue( EDSProfileProtocolVersion ) );
-	
+
+	//For extended error code logging
+    if(iRepositorySSC)
+        {
+        TBuf<KBufferLength> tempStr;
+        //Get the Operator server ID configured in cenrep
+        TInt error = iRepositorySSC->Get(KNsmlOperatorProfileServerId, tempStr);
+        if(error == KErrNone)
+            {
+            if(tempStr.Compare(*iDSServerId)== KErrNone)
+                {
+                //Extended Server Error logging supported, set the the flag
+                iIsExtendedServerErrorCodesSupported = ETrue;
+                }
+            }
+        }
 	// set sync started to P&S (if fails -> sync not interrupted)
 	if ( iProtocolVer == ESmlVersion1_1_2 )
 	    {
@@ -2850,7 +2886,10 @@
 	
 		TTime time;
 		time.UniversalTime();
+		if (iError)  
 		iSyncLog->SetResult( time, iError->SyncLogErrorCode() );
+		else
+		iSyncLog->SetResult( time, KErrGeneral );    
 	
 		CNSmlDSSettings* settings = CNSmlDSSettings::NewLC();
 		CNSmlDSProfile* profile = settings->ProfileL( iProfileID );
@@ -2937,7 +2976,10 @@
 	TDesC8& cmd = iSyncMLCmds->ResponseController()->Cmd( aEntryID );
 	TNSmlError::TNSmlSyncMLStatusCode status = STATIC_CAST( TNSmlError::TNSmlSyncMLStatusCode, iSyncMLCmds->ResponseController()->StatusCode( aEntryID ) );
 	TBool error( EFalse );
-			
+	if(iIsExtendedServerErrorCodesSupported)
+	    {
+	    StoreServerStatusCode(status);
+	    }
 	switch ( status )
 		{
 		case TNSmlError::ESmlStatusInProgress:
@@ -4245,4 +4287,91 @@
     CleanupStack::PopAndDestroy(rep);
     }
 
+// ------------------------------------------------------------------------------------------------------------------
+// CNSmlDSAgent::InitializeServerStatusCodeList()
+// @description This function reads list of configured server status codes
+//              from cenrep and stores them locally in an array for later comparision during sync
+// ------------------------------------------------------------------------------------------------------------------
+void CNSmlDSAgent::InitializeServerStatusCodeList()
+    {
+    DBG_FILE(_S8("CNSmlDSAgent::InitializeServerStatusCodeList() begins"));
+    TRAPD(error, iRepositorySSC = CRepository::NewL(KNsmlOperatorCenrepUID));
+    if(error == KErrNone && iRepositorySSC!= NULL)
+        {
+        TBuf<KBufferLength> tempStr;
+        error = iRepositorySSC->Get(KNsmlExtendedServerStatusCodeList, tempStr);
+        if(error == KErrNone)
+            {
+            TInt commaPos = -1;
+            TInt codesCount = 0;
+            while ((commaPos = tempStr.Locate(',')) > KErrNotFound)
+                {
+                ++codesCount;
+                tempStr.Replace(commaPos,1,KSpace);
+                }
+            TRAPD(error, iServerStatusCodeArray = new (ELeave) RArray<TInt>(codesCount));
+            if(error == KErrNone && iServerStatusCodeArray!= NULL)
+                {
+				TLex lex(tempStr);
+				while(!lex.Eos())
+					{
+					TPtrC token=lex.NextToken();
+					TLex temp(token);
+					TInt val;
+					temp.Val(val);
+					TRAP(error, iServerStatusCodeArray->AppendL(val));
+					if(error !=KErrNone)
+						{
+						DBG_FILE(_S8("Item Could not be appended to array"));
+						}
+					}
+                }
+            else
+                {
+                iServerStatusCodeArray = NULL;
+                DBG_FILE(_S8("Error creating iServerStatusCodeArray"));
+                }
+            }
+        else
+            {
+	        DBG_FILE(_S8("Could not find ServerStatusCodeList Key in cenrep"));
+            }
+        }
+    else
+        {
+        iRepositorySSC = NULL;
+        DBG_FILE(_S8("Error opening cenrep to store Server Status Codes"));
+        }
+    DBG_FILE(_S8("CNSmlDSAgent::InitializeServerStatusCodeList() ends"));
+    }
+// ------------------------------------------------------------------------------------------------------------------
+// CNSmlDSAgent::StoreServerStatusCode(TInt aServerStatusCode)
+// @description This function stores Sync ML Server Status code to cenrep for Operator profile sync if matched with configured list of codes,
+//              and the same code can be used by any client for error logging.
+//              If there are multiple status codes during sync, the last server status code is stored.
+// @param aServerStatusCode Sync ML server status code while sync ongoing.
+// ------------------------------------------------------------------------------------------------------------------
+void CNSmlDSAgent::StoreServerStatusCode(TInt aServerStatusCode) const
+    {
+    DBG_FILE(_S8("CNSmlDSAgent::StoreServerStatusCode() begins"));
+	if(iServerStatusCodeArray)
+	    {
+	    if(iServerStatusCodeArray->Find(aServerStatusCode) != KErrNotFound)
+	        {
+	        if(iRepositorySSC)
+	            {
+	            TInt error = iRepositorySSC->Set(KNsmlExtendedServerStatusCode, aServerStatusCode);
+	            if (error != KErrNone)
+	                {
+	                DBG_FILE(_S8("Error in storing the server status code in cenrep"));
+	                }
+	            }
+	        else
+	            {
+	            DBG_FILE(_S8("Repository for SSC could not be found"));
+	            }
+	        }
+	    }
+    DBG_FILE(_S8("CNSmlDSAgent::StoreServerStatusCode() ends"));
+    }
 // End of file  
diff -r 3d85de3d90be -r 1b024573da70 syncmlfw/ds/syncagent/src/nsmldscmds.cpp
--- a/syncmlfw/ds/syncagent/src/nsmldscmds.cpp	Mon Mar 08 21:44:11 2010 +0000
+++ b/syncmlfw/ds/syncagent/src/nsmldscmds.cpp	Sun Mar 14 13:12:06 2010 +0000
@@ -24,6 +24,7 @@
 #include <nsmldebug.h>
 #include <nsmlphoneinfo.h>
 #include <nsmlunicodeconverter.h>
+#include <centralrepository.h>
 // common includes with DM
 #include "nsmlcliagconstants.h"
 #include "NSmlCmdsBase.h"
@@ -50,7 +51,7 @@
 #include "nsmldssettings.h"
 #include "nsmldsbatchbuffer.h"
 #include "nsmldshostclient.h"
-
+#include "nsmloperatordefines.h"
 
 #ifndef __WINS__
 // This lowers the unnecessary compiler warning (armv5) to remark.
@@ -62,6 +63,7 @@
 
 // CONSTANTS
 _LIT8( KNSmlRoot, "/" );
+static const TInt KMaxLength = 255;
 
 // ============================ MEMBER FUNCTIONS ===============================
 
@@ -1713,7 +1715,7 @@
 		}
 		
 	// status 406 is returned if <Filter> is present BUT the session continues
-	if ( aAlert->itemList->item )
+	if (  aAlert->itemList && aAlert->itemList->item )
 	    {
 	    if ( aAlert->itemList->item->target )
 	        {
@@ -2533,6 +2535,10 @@
 	// DataStore elements
 	SmlDevInfDatastoreList_t** currDatastorePtr = &devInf->datastore;
 
+    // Operator DevInf ext fields enabler : START
+    InsertOperatorExtensionDevInfFieldsL( devInf );
+    // Operator DevInf ext fields enabler : END
+	
     iDSContent.SetToFirst();
 
 	do
@@ -4650,4 +4656,113 @@
 	return lexer.Val( aNumericUid );
 	}
 
+// -----------------------------------------------------------------------------
+// CNSmlDSCmds::InsertOperatorExtensionDevInfFieldsL
+// Adds operator specific extension DevInf fields <XNam> and <XVal>
+// Currently only one <XNam> and one corresponding <XVal> field is supported
+// -----------------------------------------------------------------------------
+//
+void CNSmlDSCmds::InsertOperatorExtensionDevInfFieldsL(SmlDevInfDevInfPtr_t& aDevInf)
+    {
+    TInt error = KErrNotFound;
+    CRepository *operatorSettingsCenrep = NULL;
+    
+    // TRAP the creation of operator cenrep handle, because we don't want to 
+    // leave if the cenrep is not present
+    TRAP( error, operatorSettingsCenrep = CRepository::NewL( KNsmlOperatorCenrepUID ));
+    if( error != KErrNone )
+        {
+        // operator cenrep not found
+        return;
+        }
+    else
+        {
+        CleanupStack::PushL( operatorSettingsCenrep );
+
+        // get the server id from the current profile
+        TInt profileId( iAgent->ProfileId() );
+        CNSmlDSSettings* dsSettings = CNSmlDSSettings::NewLC();
+        CNSmlDSProfile* profile = NULL;
+        TRAP( error, profile = dsSettings->ProfileL( profileId ) );
+        
+        if( error != KErrNone || !profile )
+            {
+            // if there was an error in reading profile from the profile ID
+            // return do not proceed to change the DevInf
+            CleanupStack::PopAndDestroy( dsSettings );
+            CleanupStack::PopAndDestroy( operatorSettingsCenrep );
+            return; 
+            }
+        
+        HBufC* buffSerVerId = HBufC::NewLC( KMaxLength );
+        TPtr ptrCurrentServerId = buffSerVerId->Des();
+        ptrCurrentServerId.Copy( profile->StrValue( EDSProfileServerId ) );
+        
+        // get the server id from operator cenrep
+        HBufC* buffCenrepServerId = HBufC::NewLC( KMaxLength );
+        TPtr ptrCenrepServerId = buffCenrepServerId->Des();        
+        error = operatorSettingsCenrep->Get( KNsmlOperatorProfileServerId, ptrCenrepServerId);
+        
+        // if serverID read from operator cenrep and current profile match only then attempt to
+        // add devInf extension fields
+        if( error == KErrNone && ptrCenrepServerId.Compare( ptrCurrentServerId ) == 0 )
+            {
+            // create 16-bit buffers to read XNam and XVal field values from cenrep
+            HBufC* buffXNamField = HBufC::NewLC( KMaxLength );
+            HBufC* buffXValField = HBufC::NewLC( KMaxLength );
+            TPtr xNamField = buffXNamField->Des();
+            TPtr xValField = buffXValField->Des();            
+        
+            TInt keyErrorXNam = operatorSettingsCenrep->Get( KNsmlOperatorDevInfExtXNam, xNamField );
+            TInt keyErrorXVal = operatorSettingsCenrep->Get( KNsmlOperatorDevInfExtXVal, xValField );
+                
+            if( keyErrorXNam == KErrNone && keyErrorXVal == KErrNone &&
+                xNamField.Length() > 0 && xValField.Length() > 0 )
+                {
+                // create 8-bit buffers of exact necessary length
+                // to write extn. fields in dev-inf
+                HBufC8* buffXNam = HBufC8::NewLC( xNamField.Length() );
+                HBufC8* buffXVal = HBufC8::NewLC( xValField.Length() );
+
+                TPtr8 xnam = buffXNam->Des();
+                TPtr8 xval = buffXVal->Des();
+
+                // copy extn fields from 16-bit desc. to 8-bit desc.
+                xnam.Copy( xNamField );
+                xval.Copy( xValField );
+    
+                SmlPcdataPtr_t XNamData;
+                PcdataNewL( XNamData, xnam );
+    
+                SmlPcdataPtr_t XValData;
+                PcdataNewL( XValData, xval );
+    
+                SmlPcdataListPtr_t listPtr = new (ELeave) SmlPcdataList_t;
+                listPtr->data = XValData;
+                listPtr->next = NULL;
+    
+                SmlDevInfExtPtr_t extElementPtr = new (ELeave) SmlDevInfExt_t;
+                extElementPtr->xnam = XNamData;
+                extElementPtr->xval = listPtr; 
+    
+                SmlDevInfExtListPtr_t extListPtr = new (ELeave) SmlDevInfExtList_t;
+                extListPtr->data = extElementPtr;
+                extListPtr->next = NULL;
+    
+                aDevInf->ext = extListPtr;
+    
+                CleanupStack::PopAndDestroy( buffXVal );
+                CleanupStack::PopAndDestroy( buffXNam );
+                }
+            CleanupStack::PopAndDestroy( buffXValField );
+            CleanupStack::PopAndDestroy( buffXNamField );     
+            }
+
+        CleanupStack::PopAndDestroy( buffCenrepServerId );   
+        CleanupStack::PopAndDestroy( buffSerVerId );
+        CleanupStack::PopAndDestroy( dsSettings );
+        CleanupStack::PopAndDestroy( operatorSettingsCenrep );
+        }
+    }
+
 // End of File
diff -r 3d85de3d90be -r 1b024573da70 syncmlfw/group/bld.inf
--- a/syncmlfw/group/bld.inf	Mon Mar 08 21:44:11 2010 +0000
+++ b/syncmlfw/group/bld.inf	Sun Mar 14 13:12:06 2010 +0000
@@ -39,6 +39,12 @@
 ../conf/datasyncsessioninfo.confml				MW_LAYER_CONFML(datasyncsessioninfo.confml)
 ../conf/datasyncsessioninfo_20029F15.crml     MW_LAYER_CRML(datasyncsessioninfo_20029F15.crml)
 
+//For extended server status code 
+../conf/nsmloperatorsettings.confml				MW_LAYER_CONFML(nsmloperatorsettings.confml)
+../conf/nsmloperatorsettings_2002682E.crml		MW_LAYER_CRML(nsmloperatorsettings_2002682E.crml)
+
+
+
 //for IAD support
 syncmlfw_stub.sis  /epoc32/data/z/system/install/syncmlfw_stub.sis 
 ../rom/NSml_variant.iby			CUSTOMER_MW_LAYER_IBY_EXPORT_PATH(NSml_variant.iby)
diff -r 3d85de3d90be -r 1b024573da70 syncmlfw/syncmlnotifier/data/SyncMLNotifier.rss
--- a/syncmlfw/syncmlnotifier/data/SyncMLNotifier.rss	Mon Mar 08 21:44:11 2010 +0000
+++ b/syncmlfw/syncmlnotifier/data/SyncMLNotifier.rss	Sun Mar 14 13:12:06 2010 +0000
@@ -77,17 +77,6 @@
 // -----------------------------------------------------------------------------
 RESOURCE TBUF r_qtn_dm_query_accept_postsale    { buf = qtn_dm_query_accept_postsale ; }
 
-//
-// -----------------------------------------------------------------------------
-//   
-// r_fota_conf_query_connection_is_needed
-// Text for the server initiated management session acception
-// pop-up query.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_fota_conf_query_connection_is_needed    { buf = qtn_fota_conf_query_connection_is_needed; }
-
 // -----------------------------------------------------------------------------
 //   
 // r_sml_server_msg_prompt
@@ -173,6 +162,25 @@
 //
 RESOURCE TBUF r_fota_query_install_now      { buf = qtn_fota_conf_query_install_now; }
 
+
+// -----------------------------------------------------------------------------
+//   
+// r_fota_query_install_force_now
+// Text indicating that firmware updating is not permitted.
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE TBUF r_fota_query_install_force_now      { buf = qtn_att_fota_conf_query_install_forced; }
+
+// -----------------------------------------------------------------------------
+//   
+// r_post_limit_fota_query_install_now
+// Text indicating that firmware updating, is to be done now or later.
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE TBUF r_post_limit_fota_query_install_now      { buf = qtn_att_fota_conf_query_install_now; }
+
 // -----------------------------------------------------------------------------
 //   
 // r_fota_update_1_warning
@@ -242,11 +250,22 @@
 RESOURCE TBUF r_fota_download_no_resume   { buf = qtn_fota_query_download_error_restart; }
 RESOURCE TBUF r_fota_download_resume   		{ buf = qtn_fota_query_download_resume; }
 
+// Update Postpone Limit
+
+RESOURCE TBUF r_fota_postpone_update_one_minute   { buf = qtn_att_fota_info_installation_postponed_one_minute; }
+RESOURCE TBUF r_fota_postpone_update_minutes   { buf = qtn_att_fota_info_installation_postponed_minutes; }
+RESOURCE TBUF r_fota_postpone_update_one_hour   { buf = qtn_att_fota_info_installation_postponed_one_hour; }
+RESOURCE TBUF r_fota_postpone_update_hours   { buf = qtn_att_fota_info_installation_postponed_hours; }
+RESOURCE TBUF r_fota_postpone_update_one_day   { buf = qtn_att_fota_info_installation_postponed_one_day; }
+RESOURCE TBUF r_fota_postpone_update_days   { buf = qtn_att_fota_info_installation_postponed_days; }
+
+
 // Header text for encryption related queries
 RESOURCE TBUF r_fota_update_dec_warning        { buf = qtn_fota_msg_query_update_dec_warning; }
 RESOURCE TBUF r_fota_update_enc                { buf = qtn_fota_msg_query_update_encrypt; }
 RESOURCE TBUF r_fota_update_enc_battery_low    { buf = qtn_fota_battery_encryption_low; }
 RESOURCE TBUF r_fota_device_memory_busy        { buf = qtn_fota_device_busy; }
+
 // =============================================================================
 // SOFTKEYS
 //
@@ -267,6 +286,25 @@
         };
     }
 
+
+// -----------------------------------------------------------------------------
+//   
+// r_sml_softkeys_force_accept
+// Query for the server initiated session acception.
+//
+// -----------------------------------------------------------------------------
+//        
+RESOURCE CBA r_sml_softkeys_force_accept__accept
+    {
+    buttons =
+        {
+        CBA_BUTTON { id = EAknSoftkeyOk;     txt = text_softkey_accept; },
+        CBA_BUTTON { txt=text_softkey_empty;},
+        CBA_BUTTON { id = EAknSoftkeyOk;     txt = text_softkey_accept; }
+        };
+    }
+
+
 //------------------------------------------------------------------------------
 //softkeys for the query to install downloaded package
 //------------------------------------------------------------------------------
@@ -280,6 +318,21 @@
         CBA_BUTTON { id = EAknSoftkeyYes; txt = text_softkey_now;   }
         };
     }
+    
+    
+//------------------------------------------------------------------------------
+//softkeys for the query to install downloaded package, customized for AT&T.
+//------------------------------------------------------------------------------
+
+RESOURCE CBA r_fota_install_query_softkeys_force__now
+    {
+    buttons =
+        {
+        CBA_BUTTON { id = EAknSoftkeyYes; txt = text_softkey_ok;   },
+        CBA_BUTTON { txt=text_softkey_empty;},
+        CBA_BUTTON { id = EAknSoftkeyYes; txt = text_softkey_ok;   }
+        };
+    }
 
 // =============================================================================
 // QUERIES
@@ -316,7 +369,6 @@
 //
 // -----------------------------------------------------------------------------
 
- 
  RESOURCE DIALOG r_fota_install_confirmation_query
     {
     flags   = EGeneralQueryFlags;
@@ -336,6 +388,120 @@
         };
     }
 
+/*
+
+RESOURCE DIALOG r_fota_install_confirmation_query
+     {
+     flags = EGeneralQueryFlags | EEikDialogFlagNoBorder | EEikDialogFlagNoShadow;
+     buttons = r_fota_install_query_softkeys_now_later__now;
+     items   =
+         {
+                 DLG_LINE
+                     {
+                     type    = EAknCtPopupHeadingPane;
+                     id      = EAknMessageQueryHeaderId;
+                     control = AVKON_HEADING
+                         {
+                         label   = qtn_sml_server_message_heading;
+                         headinglayout = R_AVKON_WML_SIGN_QUERY_HEADING_PANE;
+                         };
+                     },
+                     DLG_LINE
+                         {
+                         type    = EAknCtMessageQuery;
+                         id      = EAknMessageQueryContentId;
+                         control = AVKON_MESSAGE_QUERY
+                             {
+                             //layout    = EConfirmationQueryLayout;
+                             //animation = R_QGN_NOTE_QUERY_ANIM;
+                             message = "%U";
+                             };
+                         }
+         };
+     }
+     
+     */
+
+ 
+ // -----------------------------------------------------------------------------
+ //   
+ // r_sml_confirmation_query
+ // Query for forcing the downloaded package installation.
+ //
+ // -----------------------------------------------------------------------------
+
+  
+  RESOURCE DIALOG r_fota_force_install_confirmation_query
+     {
+     flags = EGeneralQueryFlags | EEikDialogFlagNoBorder | EEikDialogFlagNoShadow;
+     buttons = r_fota_install_query_softkeys_force__now;
+     items   =
+         {
+                 DLG_LINE
+                     {
+                     type    = EAknCtPopupHeadingPane;
+                     id      = EAknMessageQueryHeaderId;
+                     control = AVKON_HEADING
+                         {
+                         label   = qtn_sml_server_message_heading;
+                         headinglayout = R_AVKON_WML_SIGN_QUERY_HEADING_PANE;
+                         };
+                     },
+                     DLG_LINE
+                         {
+                         type    = EAknCtMessageQuery;
+                         id      = EAknMessageQueryContentId;
+                         control = AVKON_MESSAGE_QUERY
+                             {
+                             //layout    = EConfirmationQueryLayout;
+                             //animation = R_QGN_NOTE_QUERY_ANIM;
+                             message = "%U";
+                             };
+                         }
+         };
+     }
+
+  
+  // -----------------------------------------------------------------------------
+   //   
+   // r_sml_confirmation_query
+   // Query for forcing the downloaded package installation.
+   //
+   // -----------------------------------------------------------------------------
+
+    
+    RESOURCE DIALOG r_fota_install_message_query
+       {
+       flags = EGeneralQueryFlags | EEikDialogFlagNoBorder | EEikDialogFlagNoShadow;
+       buttons = r_fota_install_query_softkeys_now_later__now;
+       items   =
+           {
+                   DLG_LINE
+                       {
+                       type    = EAknCtPopupHeadingPane;
+                       id      = EAknMessageQueryHeaderId;
+                       control = AVKON_HEADING
+                           {
+                           label   = qtn_sml_server_message_heading;
+                           headinglayout = R_AVKON_WML_SIGN_QUERY_HEADING_PANE;
+                           };
+                       },
+                       DLG_LINE
+                           {
+                           type    = EAknCtMessageQuery;
+                           id      = EAknMessageQueryContentId;
+                           control = AVKON_MESSAGE_QUERY
+                               {
+                               //layout    = EConfirmationQueryLayout;
+                               //animation = R_QGN_NOTE_QUERY_ANIM;
+                               message = "%U";
+                               };
+                           }
+           };
+       }
+
+  
+  
 // -----------------------------------------------------------------------------
 //   
 // r_sml_server_msg_infonote
diff -r 3d85de3d90be -r 1b024573da70 syncmlfw/syncmlnotifier/inc/SyncMLAppLaunchNotifier.h
--- a/syncmlfw/syncmlnotifier/inc/SyncMLAppLaunchNotifier.h	Mon Mar 08 21:44:11 2010 +0000
+++ b/syncmlfw/syncmlnotifier/inc/SyncMLAppLaunchNotifier.h	Sun Mar 14 13:12:06 2010 +0000
@@ -28,16 +28,20 @@
 #include "SyncMLNotifierBase.h"    // Base class
 #include <SyncService.h>
 #include <centralrepository.h>
-
+#include <e32property.h>
 // CONSTANTS
 // From S60\SyncMLFota
 const TUid KUidNSmlMediumTypeInternet = { 0x101F99F0 };
 _LIT8( KNSmlIAPId, "NSmlIapId" );
 _LIT8( KNSmlAlwaysAsk, "-1" );
 const TInt  KDefaultTimeoutforNotes ( 30 );
-
+const TUid KDisclaimerProperty = {0x101F8769};
+const TUint32 KDisclaimerInteger = 0x00000001;
+    
 const TUid KCRUidNSmlDSApp       = { 0x101F9A1D };
 // CLASS DECLARATION
+
+class CDMDisclaimerObserver;
 /**
 *  Notifier for launching SyncML applications
 *
@@ -68,6 +72,12 @@
         * @return CSyncService* 
         */
         CSyncService* SyncServiceL( TUint aServiceId );
+        
+        /**
+        * Called to complete the message
+        * @param aDisclaimerAccepted 
+        */        
+        void CompleteMessageL(TInt aDisclaimerAccepted);
 
     private: // New functions
 
@@ -182,6 +192,7 @@
     private: // Data
         // Type of session queried
         TSyncMLSessionTypes iSmlProtocol;
+        CDMDisclaimerObserver* iObserver;
         
         // Job identifier from the parameters
         TInt                iJobId;
@@ -211,6 +222,25 @@
         TInt iBearerType;
     };
 
+/**
+* CDMDisclaimerObserver class
+* 
+*/
+class CDMDisclaimerObserver : public CActive
+    {
+    public:
+        CDMDisclaimerObserver();
+        ~CDMDisclaimerObserver();
+        void WaitOnDisclaimerL(CSyncMLAppLaunchNotifier* aPtr);
+    protected:
+        void DoCancel();
+        void RunL();
+        TInt RunError(TInt aError);
+    private:
+        TInt iPropertyVal;
+        RProperty iDisclaimerProperty;
+        CSyncMLAppLaunchNotifier* iNot;    
+    };
 
 #endif      // CSYNCMLAPPLAUNCHNOTIFIER_H   
             
diff -r 3d85de3d90be -r 1b024573da70 syncmlfw/syncmlnotifier/inc/SyncMLFwUpdNotifier.h
--- a/syncmlfw/syncmlnotifier/inc/SyncMLFwUpdNotifier.h	Mon Mar 08 21:44:11 2010 +0000
+++ b/syncmlfw/syncmlnotifier/inc/SyncMLFwUpdNotifier.h	Sun Mar 14 13:12:06 2010 +0000
@@ -111,6 +111,17 @@
         * @return Result to the query
         */
         TInt ShowUpdateResultWithEncryptionNoteL();
+		
+		
+		/**
+        * Informs the user about the firmware update and its consequences.
+        * Queries if the user wants to continue with the update.
+        * It also makes sure that the number of postpones the user does
+        * does not exceed the maximum allowed postpones.
+        * @param queryType - Which tells the type of query to be shown.
+        * @return Result to the query
+        */
+        TInt ShowPostLimitUpdateStartQueryL(TInt queryType);
 
         /**
         * Retrieves the profile name using the profile identifier stored
@@ -153,6 +164,13 @@
 				TInt ShowDownloadCancelledL();
 		
 				/*Message note shown to the user when ever 
+				 * the user postpones the update 
+				 * @param None
+				 * @return Result to the query
+				 */
+				TInt ShowPostponeLimitNoteL();
+
+				/*Message note shown to the user when ever 
 				 * the user wants to resume the download.
 		     * @param None
          * @return Result to the query
@@ -218,6 +236,14 @@
 //        #ifdef RD_FOTA_FLEXIBLE_MEMORY_USAGE
         TInt        iFotaMemoryNeeded;
 //        #endif
+        // The Number of times user has postponed the update.
+        TInt iUserPostponeCount;
+        
+        // The Maximum number of times update can be postponed.
+        TInt iMaxPostponeCount;
+        
+        // The option Selected by the user to postpone the update.
+        TBuf<KSyncMLMaxServerMsgLength>    iSelectedReminder;
         //Checks whether dialog from RUNL popped and waiting for user input
         TBool iRunLhang;
         
@@ -226,6 +252,12 @@
         
 		//To decide on encryption note or default note.
         TBool iFotaEncryptReq;
+        
+      // The time interval chosen by the user to postpone the update.
+      TInt iInterval;
+      
+      // The time interval type(in hours or minutes)chosen by the user to postpone the update.
+      TIntervalType iIntervalType;
 
     };
 
diff -r 3d85de3d90be -r 1b024573da70 syncmlfw/syncmlnotifier/loc/SyncMLNotifier.loc
--- a/syncmlfw/syncmlnotifier/loc/SyncMLNotifier.loc	Mon Mar 08 21:44:11 2010 +0000
+++ b/syncmlfw/syncmlnotifier/loc/SyncMLNotifier.loc	Sun Mar 14 13:12:06 2010 +0000
@@ -43,13 +43,6 @@
 //
 #define qtn_dm_query_accept_configuration   "Recommended update available from server %U. Download?"
 
-//d:Confirms that the user wants to connect to the Internet.
-//l:popup_note_window_1
-//w:
-//r:3.1
-//
-#define qtn_fota_conf_query_connection_is_needed   "You are about to connect to the Internet. Normal data call costs may apply. Connect?"
-
 //d:Information note to be shown for server started user informative session
 //l:popup_note_window
 //r:3.2
diff -r 3d85de3d90be -r 1b024573da70 syncmlfw/syncmlnotifier/loc/SyncMLNotifierFota.loc
--- a/syncmlfw/syncmlnotifier/loc/SyncMLNotifierFota.loc	Mon Mar 08 21:44:11 2010 +0000
+++ b/syncmlfw/syncmlnotifier/loc/SyncMLNotifierFota.loc	Sun Mar 14 13:12:06 2010 +0000
@@ -285,4 +285,99 @@
 
 #define qtn_fota_device_busy   "Device memory is busy. Try installation later."
 
+//d:Text of the confirmation query requesting if
+//d:the firmware update should be started. Asked
+//d:when the package has been retrieved. %U is the
+//d:Operator name.
+//l:popup_note_window_1
+//w:
+//r:5.0,5.2
+//
+
+#define qtn_att_fota_conf_query_install_now "A new software update for your phone is available from %U.\nThe software update process will not delete any personal data on your phone.\nInstall now?"
+
+//d:Text of the popup message query informing user that
+//d:Installation is postponed. It also displays the 
+//d:number of allowed postpone left. %0N is the number of times user has 
+//d:postponed and %1N is the total number of allowed postpone.
+//l:popup_note_window
+//r:5.0,5.2
+//
+
+#define qtn_att_fota_info_installation_postponed_one_minute "Installation postponed for 1 minute. %0N of %1N allowed postpones left."
+
+
+//d:Text of the popup message query informing user that
+//d:Installation is postponed. It also displays the 
+//d:number of allowed postpone left. %0N is the postpone option
+//d:chosen by the user in minutes.%1N is the number of times user has 
+//d:postponed and %2N is the total number of allowed postpone.
+//l:popup_note_window
+//r:5.0,5.2
+//
+
+#define qtn_att_fota_info_installation_postponed_minutes "Installation postponed for %0N minutes. %1N of %2N allowed postpones left."
+
+
+//d:Text of the popup message query informing user that
+//d:Installation is postponed. It also displays the 
+//d:number of allowed postpone left. %0N is the number of times user has 
+//d:postponed and %1N is the total number of allowed postpone.
+//l:popup_note_window
+//r:5.0,5.2
+//
+
+
+#define qtn_att_fota_info_installation_postponed_one_hour "Installation postponed for 1 hour. %0N of %1N allowed postpones left."
+
+
+//d:Text of the popup message query informing user that
+//d:Installation is postponed. It also displays the 
+//d:number of allowed postpone left. %0N is the postpone option
+//d:chosen by the user in hours.%1N is the number of times user has 
+//d:postponed and %2N is the total number of allowed postpone.
+//l:popup_note_window
+//r:5.0,5.2
+//
+
+
+#define qtn_att_fota_info_installation_postponed_hours "Installation postponed for %0N hours. %1N of %2N allowed postpones left."
+
+
+//d:Text of the popup message query informing user that
+//d:Installation is postponed. It also displays the 
+//d:number of allowed postpone left. %0N is the number of times user has 
+//d:postponed and %1N is the total number of allowed postpone.
+//l:popup_note_window
+//r:5.0,5.2
+//
+
+#define qtn_att_fota_info_installation_postponed_one_day "Installation postponed for 1 day. %0N of %1N allowed postpones left."
+
+
+
+//d:Text of the popup message query informing user that
+//d:Installation is postponed. It also displays the 
+//d:number of allowed postpone left. %0N is the postpone option
+//d:chosen by the user in days.%1N is the number of times user has 
+//d:postponed and %2N is the total number of allowed postpone.
+//l:popup_note_window
+//r:5.0,5.2
+//
+
+#define qtn_att_fota_info_installation_postponed_days "Installation postponed for %0N days. %1N of %2N allowed postpones left."
+
+
+//d:Text of the confirmation query requesting if
+//d:the firmware update should be started. Asked
+//d:when the package has been retrieved and the 
+//d:numer of postpone is used. %U is the
+//d:Operator name.
+//l:popup_note_window_1
+//w:
+//r:5.0,5.2
+//
+
+#define qtn_att_fota_conf_query_install_forced "A new software update for your phone is available from %U.\nThe software update process will not delete any personal data on your phone.\nNo more postpones allowed. Installation will begin shortly."
+
 // End of File
diff -r 3d85de3d90be -r 1b024573da70 syncmlfw/syncmlnotifier/src/SyncMLAppLaunchNotifier.cpp
--- a/syncmlfw/syncmlnotifier/src/SyncMLAppLaunchNotifier.cpp	Mon Mar 08 21:44:11 2010 +0000
+++ b/syncmlfw/syncmlnotifier/src/SyncMLAppLaunchNotifier.cpp	Sun Mar 14 13:12:06 2010 +0000
@@ -27,6 +27,7 @@
 #include <SyncMLClientDM.h>
 #include <SyncMLClient.h>
 #include <rconnmon.h>
+#include <ecom/ecom.h>
 #include <centralrepository.h>
 #include <SyncMLNotifierDomainCRKeys.h>
 #include <SyncMLNotifier.rsg>           // Own resources
@@ -48,6 +49,7 @@
 const TUid KUidNSmlMediumTypeBluetooth = { 0x101F99F1 };
 const TUid KUidNSmlMediumTypeUSB       = { 0x101F99F2 };
 const TUid KUidNSmlMediumTypeIrDA      = { 0x101F99F3 };
+const TUid KUidSmlSyncApp              = { 0x101F6DE5 };
 
 
 enum TASpBearerType
@@ -98,6 +100,7 @@
 //
 CSyncMLAppLaunchNotifier::~CSyncMLAppLaunchNotifier()
     {
+	delete iObserver;
     delete iDMSyncService;
     delete iDSSyncService;
     Cancel();   // Free own resources
@@ -226,24 +229,6 @@
         aParam.iJobId = iJobId;
         aServerName = syncProfile.DisplayName();
         aUserInteraction = syncProfile.SanUserInteraction();
-        
-        // Check if always ask is selected as accesspoint
-        RSyncMLConnection connection;
-        TRAPD( iapError, connection.OpenL( syncProfile, KUidNSmlMediumTypeInternet.iUid ) );
-        CleanupClosePushL( connection );
-
-        if ( !iapError )
-            {
-            const TDesC8& iap = connection.GetPropertyL( KNSmlIAPId );
-            if ( iap.Compare( KNSmlAlwaysAsk() ) == 0 )
-                {
-                iAlwaysAsk = ETrue;
-                }            
-            }
-
-        connection.Close();
-        CleanupStack::Pop( &connection );
-        
         syncProfile.Close();
         CleanupStack::Pop( &syncProfile );
         }
@@ -428,13 +413,7 @@
     {
     FLOG(_L("[SmlNotif]\t CSyncMLAppLaunchNotifier::RunL()"));
 		stringholder =NULL;
-		centrep = NULL;
-    TRAPD( err, centrep = CRepository::NewL( KCRUidDeviceManagementInternalKeys) );    
-    if(err)
-    {
-    	centrep = NULL;
-    }
-
+		
     TLanguage language = User::Language();  
     // Load the parameters and set the query text according to the session type.
     switch( iSmlProtocol )
@@ -447,6 +426,8 @@
             RetrieveSyncParamsL( param, serverName, uiAction );
             stringholder = StringLoader::LoadL( R_SML_INIT_DS_SERVER_PROMPT,
                                                 serverName );
+            if(!stringholder)
+                return;
             }
 			break;
         case ESyncMLMgmtSession:
@@ -465,6 +446,13 @@
         }
 
     CleanupStack::PushL( stringholder );
+    	
+   	centrep = NULL;
+    TRAPD( err, centrep = CRepository::NewL( KCRUidDeviceManagementInternalKeys) );    
+    if(err)
+    {
+    	centrep = NULL;
+    }
 
     TInt keypress( 0 );
     TBool  silent = EFalse;
@@ -711,34 +699,13 @@
 void CSyncMLAppLaunchNotifier::HandleCompleteMessageL(TInt &keypress, TBool &silent, TInt &SanSupport, TInt &Timeout, TInt &CustomNotes)
 {
 	TLanguage language = User::Language();
+	TInt err = KErrNone;
+	_LIT_SECURITY_POLICY_S0(KWritePolicy,KUidSmlSyncApp.iUid);
+	_LIT_SECURITY_POLICY_C1( KReadPolicy, ECapabilityReadDeviceData );
+	                  
 	if( keypress == EAknSoftkeyYes || keypress == EAknSoftkeyOk || silent ) // User has accepted the dialog
   {
 		TInt retval = 1; // Default for ESyncMLSyncSession or silent
-    if ( iSmlProtocol == ESyncMLMgmtSession && !silent )
-    {
-    	CRepository* cRepository=NULL;
-			TRAPD ( error, cRepository = CRepository::NewL ( KCRUidNSmlNotifierDomainKeys ) );
-		 	if ( error == KErrNone )
-			{
-				CleanupStack::PushL( cRepository );
-				TInt dmChargingNote(1);
-				cRepository->Get ( KNSmlDMChargingNote, dmChargingNote );
-				if(dmChargingNote==1)
-				{
-			    	stringholder = StringLoader::LoadLC( R_FOTA_CONF_QUERY_CONNECTION_IS_NEEDED );
-			    	CSyncMLTimedQueryDialog* dlg = CSyncMLTimedQueryDialog::NewL( *stringholder, Timeout );			    
-			    	dlg->PrepareLC( R_SML_CONFIRMATION_QUERY );
-        		dlg->ButtonGroupContainer().SetCommandSetL( R_AVKON_SOFTKEYS_YES_NO );
-       			keypress = dlg->RunLD();
-         		if( keypress == EAknSoftkeyYes ||	keypress == EAknSoftkeyOk ) 
-         			retval = 1;
-         		else retval = 0;   
-			    	dlg = NULL;
-			    	CleanupStack::PopAndDestroy( stringholder );
-        }
-        CleanupStack::PopAndDestroy( cRepository );//cRepository
-      }
-    }
 	if( iSmlProtocol == ESyncMLMgmtSession && SanSupport == EON && silent && iUimode == ESANUserInformative )
 	{
 		// Turn lights on and deactivate apps -key
@@ -770,12 +737,23 @@
 	    					param.iServiceId = KDataSyncServiceStart;
 	             	break;
 	    case ESyncMLMgmtSession:
+                
+                  //Define a property for Native Disclaimer 
+                  
+	              err = RProperty::Define(KDisclaimerProperty, KDisclaimerInteger, RProperty::EInt, KReadPolicy, KWritePolicy);
+	              if (err != KErrAlreadyExists)
+	                  {
+                      User::LeaveIfError(err);
+	                  }
 	              param.iServiceId = KDevManServiceStart;
 								if( SanSupport == EON )
 								{													
 	              	param.iSilent = iUimode;	                    	                               
 								}
-			          pckg.iSecureId = SyncServiceL( param.iServiceId )->StartSyncL( param );
+				iObserver = new (ELeave) CDMDisclaimerObserver();
+				pckg.iSecureId = SyncServiceL( param.iServiceId )->StartSyncL( param );
+				FLOG(_L("[SmlNotif]\t WaitonDisclaimerL called"));
+				iObserver->WaitOnDisclaimerL(this);
 	              break;
 	    default:
 	              // This branch should never be reached, since the option
@@ -783,9 +761,12 @@
 	              User::Panic( KSmlNPanicCategory, KErrCorrupt );
 	              break;
 	  }	
-	                
-	  iMessage.WriteL( iReplySlot, TPckgBuf<TSyncMLAppLaunchNotifRetVal>(pckg) );
-	  iMessage.Complete( KErrNone );
+	 iMessage.WriteL( iReplySlot, TPckgBuf<TSyncMLAppLaunchNotifRetVal>(pckg) );
+	 if(iSmlProtocol == ESyncMLSyncSession)
+	     {
+         iMessage.Complete(KErrNone);
+
+	     }
 	 }
 	 else
 	 {
@@ -818,4 +799,101 @@
  	FLOG(_L("[SmlNotif]\t CSyncMLAppLaunchNotifier::IsLanguageSupportedL ends"));
  	return retVal;
 }
+// -----------------------------------------------------------------------------
+// CSyncMLAppLaunchNotifier::CompleteMessageL
+// Completes the message according to whether Privacy Policy disclaimer is accepted
+// -----------------------------------------------------------------------------
+//
+void CSyncMLAppLaunchNotifier::CompleteMessageL(TInt aDisclaimerAccepted)
+    {
+    FLOG(_L("[SmlNotif]\t CSyncMLAppLaunchNotifier::CompleteMessageL begins"));
+    if(aDisclaimerAccepted == 1)
+        {
+        iMessage.Complete(KErrNone);
+        }
+    else
+        {
+        iMessage.Complete(KErrCancel);
+        }
+    FLOG(_L("[SmlNotif]\t CSyncMLAppLaunchNotifier::CompleteMessageL Ends"));
+    }
+
+//---------------------------------------------------------------------------------
+// CDMDisclaimerObserver::CDMDisclaimerObserver
+// Constructor
+//---------------------------------------------------------------------------------
+CDMDisclaimerObserver::CDMDisclaimerObserver()
+: CActive(0)
+    {
+    CActiveScheduler::Add(this);
+    }
+
+//---------------------------------------------------------------------------------
+// CDMDisclaimerObserver::~CDMDisclaimerObserver
+// Destructor
+//---------------------------------------------------------------------------------
+CDMDisclaimerObserver::~CDMDisclaimerObserver()
+    {
+    Cancel();
+    iDisclaimerProperty.Close();
+    }
+
+//---------------------------------------------------------------------------------
+// CDMDisclaimerObserver::WaitOnDisclaimerL
+// Subscribes to Property set when Privacy policy disclaimer is accepted
+//---------------------------------------------------------------------------------
+void CDMDisclaimerObserver::WaitOnDisclaimerL( CSyncMLAppLaunchNotifier* aPtr)
+    {    
+    FLOG(_L("[SmlNotif]\t CDMDisclaimerObserver::WaitOnDisclaimerL begins"));
+    iNot = aPtr;
+    // subscribe;
+	if(!IsActive())
+		{
+		TInt err= iDisclaimerProperty.Attach(KDisclaimerProperty, KDisclaimerInteger, EOwnerThread);		
+        //User::LeaveIfError(err);
+		iStatus=KRequestPending;
+		iDisclaimerProperty.Subscribe(iStatus);
+        SetActive();
+		}            
+	FLOG(_L("[SmlNotif]\t CDMDisclaimerObserver::WaitOnDisclaimerL ends"));
+    }
+
+// --------------------------------------------------------------------------
+// CDMDisclaimerObserver::DoCancel()
+// From base class
+// --------------------------------------------------------------------------
+//
+void CDMDisclaimerObserver::DoCancel()
+    {
+	 if( iStatus == KRequestPending )
+    	{	    	
+    	TRequestStatus* status = &iStatus;
+    	User::RequestComplete( status, KErrCancel );
+    	}
+    }    
+// --------------------------------------------------------------------------
+// CDMDisclaimerObserver::RunL()
+// Calls CompleteMessageL 
+// --------------------------------------------------------------------------
+//
+void CDMDisclaimerObserver::RunL()
+    {
+    FLOG(_L("[SmlNotif]\t CDMDisclaimerObserver::RunL begins"));
+    iDisclaimerProperty.Get(iPropertyVal);
+     
+    iNot->CompleteMessageL(iPropertyVal);
+        
+    FLOG(_L("[SmlNotif]\t CDMDisclaimerObserver::RunL End"));
+    }
+
+// --------------------------------------------------------------------------
+// CDMDisclaimerObserver::RunError()
+// --------------------------------------------------------------------------
+//
+TInt CDMDisclaimerObserver::RunError(TInt aError)
+    {
+    FTRACE( FPrint( _L("[SmlNotif]\t CDMDisclaimerObserver::RunError() Error = %d"), aError ) );
+    return aError;
+    }
+    
 //  End of File  
diff -r 3d85de3d90be -r 1b024573da70 syncmlfw/syncmlnotifier/src/SyncMLFwUpdNotifier.cpp
--- a/syncmlfw/syncmlnotifier/src/SyncMLFwUpdNotifier.cpp	Mon Mar 08 21:44:11 2010 +0000
+++ b/syncmlfw/syncmlnotifier/src/SyncMLFwUpdNotifier.cpp	Sun Mar 14 13:12:06 2010 +0000
@@ -124,6 +124,14 @@
     iNoteInfo = pckg().iIntParam;
     iFotaMemoryNeeded = pckg().iMemoryNeeded;
     iFotaEncryptReq = pckg().iEncryptReq;
+	
+	iUserPostponeCount = pckg().iFotaUserPostponeCount;
+    iMaxPostponeCount = pckg().iFotaMaxPostponeCount;
+    iIntervalType = pckg().iIntervalType;
+    iInterval = pckg().iInterval;
+    
+    if(pckg().iSelectedReminder.Length() > 0)
+        iSelectedReminder.Copy(pckg().iSelectedReminder);
 
     // Call SetActive() so RunL() will be called by the active scheduler
     //
@@ -145,6 +153,8 @@
     FLOG(_L("[SmlNotif]\t CSyncMLFwUpdNotifier::RunL()"));
 
     TInt result( KErrNone );
+    const TInt KNormal = 1;
+		const TInt KForce = 0;
 
     // Turn lights on and deactivate apps -key
     //
@@ -171,6 +181,17 @@
                 }
             break;
             }
+		case ESyncMLFwUpdPostponeLimitQuery:
+            {
+            result = ShowPostLimitUpdateStartQueryL(KNormal);
+       			break;
+     				}
+        
+        case ESyncMLFwUpdForceQuery:
+            {
+            result = ShowPostLimitUpdateStartQueryL(KForce);
+            break;
+            }
             
         case ESyncMLFwUpdStartQuery:
             {
@@ -234,6 +255,11 @@
             result = ShowUpdateStartQueryEncryptionL();
             break;
             }
+		case ESyncMLFwUpdPostponeNote:
+            {
+            result = ShowPostponeLimitNoteL();
+            break; 
+            }
         default: // Unhandled note type
             {
             FLOG(_L("[SMLNOTIF]\t CSyncMLDlgNotifier::RunL() Note type not handled"));
@@ -473,6 +499,135 @@
     return retval;
     }
 
+
+// -----------------------------------------------------------------------------
+// CSyncMLFwUpdNotifier::ShowPostLimitUpdateStartQueryL
+// -----------------------------------------------------------------------------
+//
+TInt CSyncMLFwUpdNotifier::ShowPostLimitUpdateStartQueryL(TInt aQueryType)
+{	    
+	    FTRACE( FPrint( _L(
+	        "[SmlNotif]\t CSyncMLFwUpdNotifier::ShowUpdateStartQueryL() profileId = %d" ),
+	        aQueryType ) );
+        
+      HBufC* headerText = StringLoader::LoadLC( R_FOTA_TITLE_PHONE_UPDATES );
+      TInt retval (ESyncMLDlgRespKeyNone);  
+      
+      TBool keypress(EFalse);
+//      CSyncMLQueryDialog* dlg = CSyncMLQueryDialog::NewL(keypress);
+      
+      CSyncMLMessageQueryDialog* msgDlg = CSyncMLMessageQueryDialog::NewL(keypress);
+      
+      // Implementation of notes for postpone limit requirement.
+        TBuf< KSyncMLMaxProfileNameLength > operatorName;
+        RetrieveProfileNameL( operatorName );
+        
+        HBufC* stringHolder = NULL;
+        retval = ESyncMLDlgRespKeyOk;       
+        TBool bShowInstallQuery = ETrue;
+        TInt fotaUpdateAppName (EFotaUpdateDM);
+        TInt errAppName = RProperty::Get( KPSUidNSmlDMSyncApp, KNSmlCurrentFotaUpdateAppName, fotaUpdateAppName );
+        TInt errShowInstall = RProperty::Get( KPSUidNSmlDMSyncApp, KDevManShowInstallNowQuery, bShowInstallQuery );
+
+        FTRACE( FPrint(
+                _L("CSyncMLFwUpdNotifier::ShowUpdateStartQueryL found key Show install query = %d"),
+                bShowInstallQuery ) );
+
+
+        if ( !errAppName && !errShowInstall && fotaUpdateAppName == EFotaUpdateNSC && !bShowInstallQuery )
+            {
+            FLOG(_L("[SmlNotif]\t CSyncMLFwUpdNotifier::ShowUpdateStartQueryL() do not show install now query "));  
+            bShowInstallQuery = EFalse;
+            }
+
+        if ( !bShowInstallQuery )
+            {
+            FLOG(_L("[SmlNotif]\t CSyncMLFwUpdNotifier::ShowUpdateStartQueryL() should not query "));   
+            }
+        else
+            {
+            FLOG(_L("[SmlNotif]\t CSyncMLFwUpdNotifier::ShowUpdateStartQueryL() will query for Install now? "));
+            if(aQueryType)
+                {
+                stringHolder = StringLoader::LoadLC( R_POST_LIMIT_FOTA_QUERY_INSTALL_NOW, operatorName );
+                msgDlg->SetMessageTextL( *stringHolder );
+                //dlg->SetPromptL( *stringHolder );
+                }
+            else
+                {
+                stringHolder = StringLoader::LoadLC( R_FOTA_QUERY_INSTALL_FORCE_NOW, operatorName );
+                msgDlg->SetMessageTextL( *stringHolder );
+                }
+            CleanupStack::PopAndDestroy( stringHolder );
+            stringHolder = NULL;
+            retval = ESyncMLDlgRespKeyNone;
+            if(aQueryType)
+                {
+                //retval = dlg->ExecuteLD( R_FOTA_INSTALL_CONFIRMATION_QUERY );
+                msgDlg->PrepareLC( R_FOTA_INSTALL_MESSAGE_QUERY );
+                msgDlg->SetHeaderTextL( headerText->Des() );
+                retval = msgDlg->RunLD();
+                }
+            else
+                {
+                //retval = dlg->ExecuteLD( R_FOTA_FORCE_INSTALL_CONFIRMATION_QUERY );
+                msgDlg->PrepareLC( R_FOTA_FORCE_INSTALL_CONFIRMATION_QUERY );
+                msgDlg->SetHeaderTextL( headerText->Des() );
+                msgDlg->RunLD();
+                }
+            //dlg = NULL;
+            msgDlg = NULL;
+            }   
+        // set KDevManShowInstallNowQuery key back to value that it should show query
+        TInt err = RProperty::Set(KPSUidNSmlDMSyncApp,KDevManShowInstallNowQuery,1 );
+        FTRACE( FPrint(
+                _L("Install query is set back to be shown, err = %d"),
+                err ) );
+        
+
+        if ( !keypress && retval )
+            {
+            stringHolder = StringLoader::LoadLC( R_FOTA_UPDATE_2_WARNING );
+
+            //keypress is EFalse here
+            msgDlg = CSyncMLMessageQueryDialog::NewL(keypress);
+            msgDlg->SetMessageTextL( *stringHolder );
+
+            CleanupStack::PopAndDestroy( stringHolder );
+            stringHolder = NULL;
+
+            msgDlg->PrepareLC( R_SML_MESSAGE_QUERY );  // Pushed dialog is popped inside RunLD
+            msgDlg->SetHeaderTextL( headerText->Des() );
+
+            if(aQueryType)
+                {
+                msgDlg->ButtonGroupContainer().SetCommandSetL( 
+                        R_SML_SOFTKEYS_ACCEPT_CANCEL__ACCEPT );
+                }
+            else
+                {
+                msgDlg->ButtonGroupContainer().SetCommandSetL( 
+                        R_SML_SOFTKEYS_FORCE_ACCEPT__ACCEPT );
+                }
+
+            retval = ESyncMLDlgRespKeyNone;
+            retval = msgDlg->RunLD();
+            msgDlg = NULL;
+            }
+        
+      CleanupStack::PopAndDestroy( headerText );
+    
+    FTRACE( FPrint( _L(
+        "[SmlNotif]\t CSyncMLFwUpdNotifier::ShowUpdateStartQueryL() completed: retval = %d, keypress = %d" ),
+        retval,keypress ) );
+
+	//call-termination key press is handled here.
+	if (keypress)
+    	retval = ESyncMLDlgRespKeyOthers;
+	
+    return retval;
+}
+
 // -----------------------------------------------------------------------------
 // CSyncMLFwUpdNotifier::ShowUpdateStartQueryL
 // -----------------------------------------------------------------------------
@@ -937,6 +1092,76 @@
      
     return retval;
 }
+
+
+// -----------------------------------------------------------------------------
+// CSyncMLFwUpdNotifier::ShowPostponeLimitNoteL
+// Shows the notification that the download is Postponed.
+// -----------------------------------------------------------------------------
+//
+TInt CSyncMLFwUpdNotifier::ShowPostponeLimitNoteL()
+{
+
+    FLOG( _L(
+        "[SmlNotif]\t CSyncMLFwUpdNotifier::ShowPostponeLimitNoteL() begin "));
+
+    TInt retval (KErrNone);
+    const TInt KTmpArraySize = 5;
+		//const TInt KStrArraySize = 20;
+    
+    CDesCArrayFlat* aStrArr = new CDesCArrayFlat(KTmpArraySize); 
+    CleanupStack::PushL(aStrArr);
+    aStrArr->AppendL(iSelectedReminder);
+    CArrayFixFlat<TInt>* aIntparam = new(ELeave) CArrayFixFlat<TInt>(KTmpArraySize);
+    CleanupStack::PushL(aIntparam);
+    TInt leftPostpone =  iMaxPostponeCount - iUserPostponeCount;
+    if(iInterval > 1)
+        aIntparam->AppendL(iInterval);
+    aIntparam->AppendL(leftPostpone);
+    aIntparam->AppendL(iMaxPostponeCount);
+    
+    HBufC* stringHolder( NULL );
+    //stringHolder = StringLoader::LoadLC( R_FOTA_POSTPONE_UPDATE, *aStrArr, *aIntparam);
+    if(iIntervalType == EMonthly)
+    {
+    	if(iInterval > 1)
+    	    stringHolder = StringLoader::LoadLC( R_FOTA_POSTPONE_UPDATE_MINUTES, *aIntparam);
+    	else
+    	    stringHolder = StringLoader::LoadLC( R_FOTA_POSTPONE_UPDATE_ONE_MINUTE, *aIntparam);
+  	}
+  	else if(iIntervalType == EHourly)
+    {
+    	if(iInterval > 1)
+    	    stringHolder = StringLoader::LoadLC( R_FOTA_POSTPONE_UPDATE_HOURS, *aIntparam);
+    	else
+    	    stringHolder = StringLoader::LoadLC( R_FOTA_POSTPONE_UPDATE_ONE_HOUR, *aIntparam);
+    		
+    }
+    else if(iIntervalType == EDaily)
+    {
+    	if(iInterval > 1)
+    	    stringHolder = StringLoader::LoadLC( R_FOTA_POSTPONE_UPDATE_DAYS, *aIntparam);
+    	else
+    	    stringHolder = StringLoader::LoadLC( R_FOTA_POSTPONE_UPDATE_ONE_DAY, *aIntparam);
+    		
+  	}
+    CAknInformationNote* infoNote = new (ELeave) CAknInformationNote;
+
+    infoNote->ExecuteLD( *stringHolder );
+
+    
+    CleanupStack::PopAndDestroy();
+    CleanupStack::PopAndDestroy( aIntparam );
+    CleanupStack::PopAndDestroy(aStrArr);
+        
+    FLOG( _L(
+        "[SmlNotif]\t CSyncMLFwUpdNotifier::ShowPostponeLimitNoteL() Completed "));   
+     
+    return retval;
+}
+
+
+
 // -----------------------------------------------------------------------------
 // CSyncMLFwUpdNotifier::ShowDownloadResumeL
 // Shows the notification to the user for resuming the download.
diff -r 3d85de3d90be -r 1b024573da70 terminalsecurity/SCP/SCPClient/src/SCPClient.cpp
--- a/terminalsecurity/SCP/SCPClient/src/SCPClient.cpp	Mon Mar 08 21:44:11 2010 +0000
+++ b/terminalsecurity/SCP/SCPClient/src/SCPClient.cpp	Sun Mar 14 13:12:06 2010 +0000
@@ -39,7 +39,7 @@
 #include <TerminalControl3rdPartyAPI.h>
 #include <SCPServerInterface.h>
 #include <SecUi.rsg>
-#include <SecUi.hrh>
+#include <secui.hrh>
 #include <StringLoader.h>
 #include <bautils.h>
 //#endif // DEVICE_LOCK_ENHANCEMENTS
diff -r 3d85de3d90be -r 1b024573da70 terminalsecurity/SCP/SCPClient/src/SCPQueryDialog.cpp
--- a/terminalsecurity/SCP/SCPClient/src/SCPQueryDialog.cpp	Mon Mar 08 21:44:11 2010 +0000
+++ b/terminalsecurity/SCP/SCPClient/src/SCPQueryDialog.cpp	Sun Mar 14 13:12:06 2010 +0000
@@ -24,7 +24,7 @@
 #include <avkon.rsg>
 #include <SecUi.rsg>
 // Include the SecUi definitions
-#include <SecUi.hrh>
+#include <secui.hrh>
 #include "SCPDebug.h"
 #include <SCPNotifier.rsg>
 // For Central Repository
@@ -262,8 +262,11 @@
     // we are already on forgeround, need to update priority differently
 	if (var != EPSCTsyCallStateNone)
 	{
+		if (iECSSupport)
+		{
+		iEikonEnv->RootWin().SetOrdinalPosition(1,ECoeWinPriorityNormal);
+		}
 	
-	iEikonEnv->RootWin().SetOrdinalPosition(1,ECoeWinPriorityNormal);
 	}
     else if ((wgPrio == ECoeWinPriorityAlwaysAtFront)&&(iECSSupport))
         {
diff -r 3d85de3d90be -r 1b024573da70 terminalsecurity/SCP/SCPDatabase/src/SCPParamDB.cpp
--- a/terminalsecurity/SCP/SCPDatabase/src/SCPParamDB.cpp	Mon Mar 08 21:44:11 2010 +0000
+++ b/terminalsecurity/SCP/SCPDatabase/src/SCPParamDB.cpp	Sun Mar 14 13:12:06 2010 +0000
@@ -177,9 +177,8 @@
 
     __LEAVE_IF_ERROR(lDBView.Prepare(iParameterDB, TDbQuery(*lSelectQry)));
     __LEAVE_IF_ERROR(lDBView.EvaluateAll());
-    if(EFalse == lDBView.FirstL()) {
-        return KErrNotFound;
-    }
+
+    lDBView.FirstL();
 
     TInt lRowCount = lDBView.CountL();
 
@@ -213,10 +212,8 @@
 
     __LEAVE_IF_ERROR(lDBView.Prepare(iParameterDB, TDbQuery(*lSelectQry)));
     __LEAVE_IF_ERROR(lDBView.EvaluateAll());
-    
-    if(EFalse == lDBView.FirstL()) {
-        return KErrNotFound;
-    }
+
+    lDBView.FirstL();
 
     TInt size(0);
     TInt lRowCount = lDBView.CountL();
@@ -332,8 +329,7 @@
         _SCPDB_LOG(_L("[CSCPParamDB]-> WARNING: Nothing to do!!"));
         return KErrNone;  
     }
-    
-    TInt lAffRows(0);
+
     HBufC* lDelQuery(NULL);
     
     if(iParameterDB.InTransaction()) {
@@ -353,7 +349,7 @@
             lDelQuery->Des().Format(KDeleteWhereParamIDValueDesAppID, aParamID, &(aParamValues[i])->Des(), aApp);
         }
 
-        lAffRows = iParameterDB.Execute(*lDelQuery);
+        TInt lAffRows = iParameterDB.Execute(*lDelQuery);
         _SCPDB_LOG(_L("[CSCPParamDB]-> INFO: Total rows affected=%d"), lAffRows);
         CleanupStack :: PopAndDestroy();
     }
@@ -418,8 +414,7 @@
 
 TInt CSCPParamDB :: DropValuesL(TInt aParamID, const TInt32 aApp) {
     _SCPDB_LOG(_L("[CSCPParamDB]-> DropValuesL() >>>"));
-    
-    TInt lAffRows(0);
+
     HBufC* lDelQuery(NULL);
     
     if(iParameterDB.InTransaction()) {
@@ -439,7 +434,7 @@
     }
     _SCPDB_LOG(_L("[CSCPParamDB]-> SQL Query: %S"), &lDelQuery->Des());
 
-    lAffRows = iParameterDB.Execute(*lDelQuery);
+    TInt lAffRows = iParameterDB.Execute(*lDelQuery);
     _SCPDB_LOG(_L("[CSCPParamDB]-> INFO: Total rows affected=%d"), lAffRows);
     CleanupStack :: PopAndDestroy();
     
diff -r 3d85de3d90be -r 1b024573da70 terminalsecurity/SCP/SCPHistoryPlugin/src/SCPHistoryPlugin.cpp
--- a/terminalsecurity/SCP/SCPHistoryPlugin/src/SCPHistoryPlugin.cpp	Mon Mar 08 21:44:11 2010 +0000
+++ b/terminalsecurity/SCP/SCPHistoryPlugin/src/SCPHistoryPlugin.cpp	Sun Mar 14 13:12:06 2010 +0000
@@ -84,360 +84,333 @@
 // Status : Approved
 // ----------------------------------------------------------------------------
 //    
-CSCPParamObject* CSCPHistoryPlugin::HandleEvent( TInt aID, CSCPParamObject& aParam )
-	{				
-	Dprint ( ( _L( "CSCPHistoryPlugin::HandleEvent()" ) ) );
-	// Make the ParamObject for success ack, Delete later
-	CSCPParamObject* retParams = NULL;
-	
-	TBool errRaised;
-	errRaised = EFalse;
-	
-	TBool isInvalid = EFalse;
-	
-	if ( iFs == NULL )
-	    {
-	    return NULL; // Eventhandler not available
-	    }	
-	
-	// Insert the default security code into the history-buffer if not there yet
-    {	        
-    TInt errSCF = SetConfigFile ();
-	if (errSCF != KErrNone)
-	    {		
-		return NULL;
-		}
-		
-    TInt historyItemCounter = 0;
-    if ( GetHistoryItemCount( historyItemCounter ) != KErrNone )
-	    {
-	    Dprint ( ( _L( "CSCPHistoryPlugin::HandleEvent historyItemCounter = %d" ), historyItemCounter ) );
-	    // Hash the security code	
-		TBuf<KSCPPasscodeMaxLength> codeBuf;
-		TBuf<KSCPMaxHashLength> hashBuf;
-		
-		codeBuf.Copy( KSCPDefaultEnchSecCode );
-		hashBuf.Zero();
-		
-		iEventHandler->HashInput( codeBuf, hashBuf );		        
-        
-        CSCPParamObject* historyObject = NULL;
-	    TRAPD( err, historyObject = CSCPParamObject::NewL() );
-	    if ( err == KErrNone )
-	        {
- 		    historyObject->Set( KHistoryCounterParamID, 1 );
-		    historyObject->Set( KHistoryItemParamBase, hashBuf );
-        
-            TRAP_IGNORE( historyObject->WriteToFileL( iCfgFilenamepath, iFs ) );
-	        }
-	    
-	    delete historyObject;
-	    }
-    }
-	
-	
-	// check for Case
-    switch ( aID )
+CSCPParamObject* CSCPHistoryPlugin::HandleEvent(TInt aID,
+        CSCPParamObject& aParam)
+    {
+    Dprint((_L("CSCPHistoryPlugin::HandleEvent()")));
+    // Make the ParamObject for success ack, Delete later
+    CSCPParamObject* retParams = NULL;
+
+    TBool errRaised;
+    errRaised = EFalse;
+
+    TBool isInvalid = EFalse;
+
+    if (iFs == NULL)
+        {
+        return NULL; // Eventhandler not available
+        }
+
+    // check for Case
+    switch (aID)
         {
 
-        case ( KSCPEventValidate ) :
-            {            
-           	// Obtain the paramValue
-           	Dprint ( ( _L( "CSCPHistoryPlugin::KSCPEventValidate" ) ) );
-			TInt passhistoryParamValue;
-			passhistoryParamValue = GetHistoryCountParamValue();
-			Dprint ( ( _L( "CSCPHistoryPlugin::HandleEvent passhistoryParamValue = %d" ), passhistoryParamValue ) );
-			// if all required bounds are zero, there is nothing to do.
-			if ( passhistoryParamValue != 0)
-			    {
-				// Get the configFile's path.
-				// If this fails, there is something badly wrong(Private folder is not there)
-				TInt errSCF = SetConfigFile ();
-				if (errSCF != KErrNone)
-				{
-					errRaised = ETrue;
-					break; // Break out from Case
-				}
+        case (KSCPEventValidate):
+            {
+            // Obtain the paramValue
+            Dprint((_L("CSCPHistoryPlugin::KSCPEventValidate")));
+            TInt passhistoryParamValue;
+            passhistoryParamValue = GetHistoryCountParamValue();
+            Dprint(
+                    (_L(
+                            "CSCPHistoryPlugin::HandleEvent passhistoryParamValue = %d"), passhistoryParamValue));
+            // if all required bounds are zero, there is nothing to do.
+            if (passhistoryParamValue != 0)
+                {
+                // Get the configFile's path.
+                // If this fails, there is something badly wrong(Private folder is not there)
+                TInt errSCF = SetConfigFile();
+                if (errSCF != KErrNone)
+                    {
+                    errRaised = ETrue;
+                    break; // Break out from Case
+                    }
 
-				// Get the historyItemCount, If the err is raised, the file is not there
-				// This will lead to KSCPEventPasswordChanged event and new history file will
-				// be created
-				TInt historyItemCounter;
-				TInt errHC = GetHistoryItemCount( historyItemCounter );
-				Dprint ( ( _L( "CSCPHistoryPlugin::HandleEvent historyItemCounter = %d" ), historyItemCounter ) );
-				if (errHC != KErrNone)
-				{
-					errRaised = ETrue;
-					break; // Break out from Case
-				}
+                // Get the historyItemCount, If the err is raised, the file is not there
+                // This will lead to KSCPEventPasswordChanged event and new history file will
+                // be created
+                TInt historyItemCounter;
+                TInt errHC = GetHistoryItemCount(historyItemCounter);
+                Dprint(
+                        (_L(
+                                "CSCPHistoryPlugin::HandleEvent historyItemCounter = %d"), historyItemCounter));
+                if (errHC != KErrNone)
+                    {
+                    errRaised = ETrue;
+                    break; // Break out from Case
+                    }
+
+                // continue with the KSCPEventValidate Check
 
-				// continue with the KSCPEventValidate Check
+                // Get the password from the paramObject
+                TBuf<KSCPPasscodeMaxLength> seccode;
+                if (aParam.Get(KSCPParamPassword, seccode) != KErrNone)
+                    {
+                    // Nothing to do anymore
+                    Dprint(
+                            (_L(
+                                    "CSCPHistoryPlugin::HandleEvent()\
+					ERROR: KSCPEventValidate/KSCPParamPassword is != KErrNone")));
+                    errRaised = ETrue;
+                    break; // Break out from Case
+                    }
+
+                // Hash  the securitycode	
+                TBuf<KSCPPasscodeMaxLength> securityhash;
+                iEventHandler->HashInput(seccode, securityhash);
+
+                // get history
+                CDesCArrayFlat* array = NULL;
+                TInt errGH = KErrNone;
 
-				// Get the password from the paramObject
-				TBuf<KSCPPasscodeMaxLength> seccode;
-				if ( aParam.Get( KSCPParamPassword, seccode ) != KErrNone )
-				{
-					// Nothing to do anymore
-					Dprint( (_L("CSCPHistoryPlugin::HandleEvent()\
-					ERROR: KSCPEventValidate/KSCPParamPassword is != KErrNone") ));
-					errRaised = ETrue;
-					break; // Break out from Case
-				}            
-				
-				// Hash  the securitycode	
-				TBuf<KSCPPasscodeMaxLength> securityhash;
-				iEventHandler->HashInput(seccode,securityhash);
-			
-				// get history
-				CDesCArrayFlat* array = NULL;
-				TInt errGH = KErrNone;
-				
-				array = new CDesCArrayFlat(1);			
-				if ( array != NULL )
-				    {
-				    TRAPD( err2, errGH = GetHistoryArrayL( *array ) );
-				    if ( err2 != KErrNone )
-				        {
-				        errGH = err2;
-				        }
-				    }
-				else
-				    {
-				    errGH = KErrNoMemory;
-				    }
-			
-				// If for some reason err is raised, break out
-				// If the Historyonfig file get deleted on the fly ex
-				if (errGH != KErrNone)
-				    {
-					errRaised = ETrue;
-					array->Reset();
-					delete array;
-					break; // Break out from Case
-				    }
-				TInt correction;
-				correction = 0;
+                array = new CDesCArrayFlat(1);
+                if (array != NULL)
+                    {
+                    TRAPD(err2, errGH = GetHistoryArrayL(*array));
+                    if (err2 != KErrNone)
+                        {
+                        errGH = err2;
+                        }
+                    }
+                else
+                    {
+                    errGH = KErrNoMemory;
+                    }
+
+                // If for some reason err is raised, break out
+                // If the Historyonfig file get deleted on the fly ex
+                if (errGH != KErrNone)
+                    {
+                    errRaised = ETrue;
+                    array->Reset();
+                    delete array;
+                    break; // Break out from Case
+                    }
+                TInt correction;
+                correction = 0;
+
+                if (array->Count() >= passhistoryParamValue)
+                    {
+                    correction = array->Count() - passhistoryParamValue;
+                    }
+                // check for match
+                TBuf<KSCPPasscodeMaxLength> arrayItem;
 
-				if ( array->Count() >=  passhistoryParamValue )
-        {
-        correction =  array->Count() - passhistoryParamValue;
-        }
-				// check for match
-				TBuf<KSCPPasscodeMaxLength> arrayItem;
-				
-				// Set the historyobject
-				for (TInt i= 0 + correction; i < array->Count(); i++)
-				    {
-					arrayItem =  array->MdcaPoint(i);
-					if (arrayItem.Compare(securityhash) == KErrNone)
-					    {
-						// Get the filesystem for Resource
-						// If fail, bail out
-						TInt errgGR = GetResource();
-						if (errgGR != KErrNone)
-						    {
-							errRaised = ETrue;
-							break; // Break out from the For
-						    }	
+                // Set the historyobject
+                for (TInt i = 0 + correction; i < array->Count(); i++)
+                    {
+                    arrayItem = array->MdcaPoint(i);
+                    if (arrayItem.Compare(securityhash) == KErrNone)
+                        {
+                        // Get the filesystem for Resource
+                        // If fail, bail out
+                        TInt errgGR = GetResource();
+                        if (errgGR != KErrNone)
+                            {
+                            errRaised = ETrue;
+                            break; // Break out from the For
+                            }
 
-						// Prompt buf, iNote can show only 97 chars,
-						// without ... markings.
-						HBufC* hbuf = NULL;					
-						
-						if ( passhistoryParamValue == 1 )
-						    {
-		                    isInvalid = ETrue;
-		                    TRAP_IGNORE(
-		                        hbuf = LoadAndFormatResL( R_SET_SEC_CODE_INFO_PREVIOUS );
-		                        );
-						    }
-						else
-						    {
-		                    isInvalid = ETrue;
-		                    TRAP_IGNORE(
-		                        hbuf = LoadAndFormatResL( 
-		                            R_SET_SEC_CODE_INFO_CHECK, 
-		                            &passhistoryParamValue );
-		                        );							    
-						    }														
+                        // Prompt buf, iNote can show only 97 chars,
+                        // without ... markings.
+                        HBufC* hbuf = NULL;
+
+                        if (passhistoryParamValue == 1)
+                            {
+                            isInvalid = ETrue;
+TRAP_IGNORE                            (
+                                    hbuf = LoadAndFormatResL( R_SET_SEC_CODE_INFO_PREVIOUS );
+                            );
+                            }
+                        else
+                            {
+                            isInvalid = ETrue;
+                            TRAP_IGNORE(
+                                    hbuf = LoadAndFormatResL(
+                                            R_SET_SEC_CODE_INFO_CHECK,
+                                            &passhistoryParamValue );
+                            );
+                            }
 
                         if ( isInvalid )
-    					    {	    							
-    				    	// Create the result-object to return
-    					    TRAPD( err, retParams  = CSCPParamObject::NewL() );
-                            
+                            {
+                            // Create the result-object to return
+                            TRAPD( err, retParams = CSCPParamObject::NewL() );
+
                             if ( err == KErrNone )
-    					        {
-        			            retParams->Set( KSCPParamStatus, KErrSCPInvalidCode );
-    	    		            retParams->Set( KSCPParamAction, KSCPActionShowUI );
-    		    	            retParams->Set( KSCPParamUIMode, KSCPUINote );
-    			                
-    			                if ( hbuf != NULL )
-    			                    {
-    			                    TPtr ptr = hbuf->Des();
-    			                    retParams->Set( KSCPParamPromptText, ptr );
-    			                    delete hbuf;
-    			                    }
-    					        }
-    					    
-    					    break;
-    					    }
-																															
-					    } // End of compare IF
-				    } // End of For
-				    
-				// kill the local
-				array->Reset();
-				delete array;
-															
-			    } // passhistoryParamValue
-			else
-			    {
-				retParams = NULL;
-			    }
+                                {
+                                retParams->Set( KSCPParamStatus, KErrSCPInvalidCode );
+                                retParams->Set( KSCPParamAction, KSCPActionShowUI );
+                                retParams->Set( KSCPParamUIMode, KSCPUINote );
+
+                                if ( hbuf != NULL )
+                                    {
+                                    TPtr ptr = hbuf->Des();
+                                    retParams->Set( KSCPParamPromptText, ptr );
+                                    delete hbuf;
+                                    }
+                                }
+
+                            break;
+                            }
+
+                        } // End of compare IF
+                    } // End of For
+
+                // kill the local
+                array->Reset();
+                delete array;
 
-			break;
-			} // end of KSCPEventValidate
-                    
+                } // passhistoryParamValue
+
+            else
+                {
+                retParams = NULL;
+                }
+
+            break;
+            } // end of KSCPEventValidate
+
         // Someone has changed the Seccode and I need to include it to history
-         case ( KSCPEventPasswordChanged ) :
-			{																
-			// Get the configFile's path.
-			Dprint ( ( _L( "CSCPHistoryPlugin::KSCPEventPasswordChanged" ) ) );
-			TInt errSCF = SetConfigFile ();
-			if (errSCF != KErrNone)
-			    {
-				errRaised = ETrue;
-				break; // Break out from the case
-			    }
-			
-			// Get the password from the paramObject
-     		TBuf<KSCPPasscodeMaxLength> securitycode;
+        case ( KSCPEventPasswordChanged ) :
+            {
+            // Get the configFile's path.
+            Dprint ( ( _L( "CSCPHistoryPlugin::KSCPEventPasswordChanged" ) ) );
+            TInt errSCF = SetConfigFile ();
+            if (errSCF != KErrNone)
+                {
+                errRaised = ETrue;
+                break; // Break out from the case
+                }
+
+            // Get the password from the paramObject
+            TBuf<KSCPPasscodeMaxLength> securitycode;
             if ( aParam.Get( KSCPParamPassword, securitycode ) != KErrNone )
                 {
-            	// Nothing to do anymore
-               	Dprint( (_L("CSCPHistoryPlugin::HandleEvent()\
+                // Nothing to do anymore
+                Dprint( (_L("CSCPHistoryPlugin::HandleEvent()\
                	ERROR: KSCPEventPasswordChanged/KSCPParamPassword is  != KErrNone") ));
-            	errRaised = ETrue;
-				break; // Break out from the Case
-                }          
+                errRaised = ETrue;
+                break; // Break out from the Case
+                }
 
-			// Hash  the securitycode	
-			TBuf<KSCPPasscodeMaxLength> securityhash;
-			iEventHandler->HashInput(securitycode,securityhash);
+            // Hash  the securitycode	
+            TBuf<KSCPPasscodeMaxLength> securityhash;
+            iEventHandler->HashInput(securitycode,securityhash);
 
-			// Get the historyItemCount, If error occures, File is not there yet, Make one
-			TInt historyItemCounter;
-			TInt errHC = GetHistoryItemCount( historyItemCounter );
-			Dprint ( ( _L( "CSCPHistoryPlugin::HandleEvent historyItemCounter = %d" ), historyItemCounter ) );
-			if (errHC != KErrNone)
-			    {
-				// The file does not exist yet (should not happen)
-				// Make the ParamObject,  Set the New historyData with count of 1
-				CSCPParamObject* historyObject = NULL;
-				TRAPD( err, historyObject = CSCPParamObject::NewL() );
-		 		if ( err == KErrNone )
-		 		    {
-			 		historyObject->Set(KHistoryCounterParamID,1);
-    				historyObject->Set(KHistoryItemParamBase,securityhash );
-                    
+            // Get the historyItemCount, If error occures, File is not there yet, Make one
+            TInt historyItemCounter;
+            TInt errHC = GetHistoryItemCount( historyItemCounter );
+            Dprint ( ( _L( "CSCPHistoryPlugin::HandleEvent historyItemCounter = %d" ), historyItemCounter ) );
+            if (errHC != KErrNone)
+                {
+                // The file does not exist yet (should not happen)
+                // Make the ParamObject,  Set the New historyData with count of 1
+                CSCPParamObject* historyObject = NULL;
+                TRAPD( err, historyObject = CSCPParamObject::NewL() );
+                if ( err == KErrNone )
+                    {
+                    historyObject->Set(KHistoryCounterParamID,1);
+                    historyObject->Set(KHistoryItemParamBase,securityhash );
+
                     TRAPD( errWC, historyObject->WriteToFileL( iCfgFilenamepath, iFs ) );
-					if ( errWC != KErrNone )
-    					{
-						Dprint( (_L("CSCPHistoryPlugin::HandleEvent(): WARNING:\
+                    if ( errWC != KErrNone )
+                        {
+                        Dprint( (_L("CSCPHistoryPlugin::HandleEvent(): WARNING:\
 						failed to write plugin configuration: %d"), errWC ));
-						errRaised = ETrue;
-						break; // Break out from the Case
-	    				}
-					delete historyObject;
-		 		    }
-			    }
-			// There are passwords avail.
-			else
-			    {
-				// Append the new passwords
-				TInt err = KErrNone;
-				TRAPD( err2, err = AppendAndWriteSecurityCodeL( securityhash  ) );
-				if ( ( err != KErrNone ) || ( err2 != KErrNone ) )
-				    {
-					errRaised = ETrue;
-					break; // Break out from the Case						
-				    }										
-			    }    					
-			break;
-			} // end of KSCPEventPasswordChanged
-          
-    	case ( KSCPEventConfigurationQuery ):
-            {            
+                        errRaised = ETrue;
+                        break; // Break out from the Case
+                        }
+                    delete historyObject;
+                    }
+                }
+            // There are passwords avail.
+
+            else
+                {
+                // Append the new passwords
+                TInt err = KErrNone;
+                TRAPD( err2, err = AppendAndWriteSecurityCodeL( securityhash ) );
+                if ( ( err != KErrNone ) || ( err2 != KErrNone ) )
+                    {
+                    errRaised = ETrue;
+                    break; // Break out from the Case						
+                    }
+                }
+            break;
+            } // end of KSCPEventPasswordChanged
+
+        case ( KSCPEventConfigurationQuery ):
+            {
             Dprint ( ( _L( "CSCPHistoryPlugin::KSCPEventConfigurationQuery" ) ) );
-        	TInt paramID = -1; 
+            TInt paramID = -1;
             // Get the ID from the paramObject      
             if ( aParam.Get( KSCPParamID, paramID ) != KErrNone )
                 {
                 // Nothing to do anymore
                 break;
-                }            
-                    
+                }
+
             // 1011
             if ( paramID == (RTerminalControl3rdPartySession::EPasscodeHistoryBuffer))
                 {
-				// OK, we're interested, check that the value is valid
-				TRAPD( err, retParams  = CSCPParamObject::NewL() );
-				if ( err != KErrNone )
-				    {
-				    break; // Nothing we can do
-				    }
+                // OK, we're interested, check that the value is valid
+                TRAPD( err, retParams = CSCPParamObject::NewL() );
+                if ( err != KErrNone )
+                    {
+                    break; // Nothing we can do
+                    }
+
+                // All of our params are TInts
+                TInt paramValue;
+                if ( aParam.Get( KSCPParamValue, paramValue ) != KErrNone )
+                    {
+                    retParams->Set( KSCPParamStatus, KErrGeneral );
+                    break;
+                    }
+
+                TInt retStatus = KErrNone;
+                switch ( paramID )
+                    {
+
+                    case ( RTerminalControl3rdPartySession::EPasscodeHistoryBuffer ):
+                        {
+                        // Bounds are be be
+                        if ( ( paramValue < KPasscodeHistoryBufferMinValue )
+                                || ( paramValue > KPasscodeHistoryBufferMaxValue ) )
+                            {
+                            // This is not a valid valuerange
+                            retStatus = KErrArgument;
+                            }
 
-				// All of our params are TInts
-				TInt paramValue;
-				if ( aParam.Get( KSCPParamValue, paramValue ) != KErrNone )
-				    {
-					retParams->Set( KSCPParamStatus, KErrGeneral );
-					break;
-				    }
-            	            
-					TInt retStatus = KErrNone;
-					switch ( paramID )
-					    {
-				
-						case ( RTerminalControl3rdPartySession::EPasscodeHistoryBuffer ):
-						    {
-							// Bounds are be be
-							if ( ( paramValue < KPasscodeHistoryBufferMinValue ) 
-							|| ( paramValue > KPasscodeHistoryBufferMaxValue ) )                                 
-							    {
-								// This is not a valid valuerange
-								retStatus = KErrArgument;
-						        }     
-							           
-						    break;				
-						    } // end of case EPasscodeHistoryBuffer
-					    } // end of switch ( paramID )
-								
-			        retParams->Set( KSCPParamStatus, retStatus );
-                    }
-			    else
-			        {
-				    retParams = NULL;
-			        }
-			 			 
-			 break;	            
-	         } //End of KSCPEventConfigurationQuery Case
-            
-            
-          case ( KSCPEventReset ):
-              {
-              Dprint ( ( _L( "CSCPHistoryPlugin::KSCPEventReset" ) ) );
-              // Reset the configuration for this plugin.
-              TRAP_IGNORE( FlushConfigFileL() );
-              
-              break;
-              }
-                          
-          } // End of  switch ( aID )
-                             
-       // Check if Any errors were raised and handle it
-    if (errRaised) 
+                        break;
+                        } // end of case EPasscodeHistoryBuffer
+                    } // end of switch ( paramID )
+
+                retParams->Set( KSCPParamStatus, retStatus );
+                }
+            else
+                {
+                retParams = NULL;
+                }
+
+            break;
+            } //End of KSCPEventConfigurationQuery Case
+
+
+        case ( KSCPEventReset ):
+            {
+            Dprint ( ( _L( "CSCPHistoryPlugin::KSCPEventReset" ) ) );
+            // Reset the configuration for this plugin.
+            TRAP_IGNORE( FlushConfigFileL() );
+
+            break;
+            }
+
+        } // End of  switch ( aID )
+
+    // Check if Any errors were raised and handle it
+    if (errRaised)
         {
         if ( retParams != NULL )
             {
@@ -445,8 +418,8 @@
             }
         retParams = NULL;
         }
-       
-    return retParams; 
+
+    return retParams;
     }
 
 // ----------------------------------------------------------------------------
diff -r 3d85de3d90be -r 1b024573da70 terminalsecurity/SCP/SCPServer/src/SCPSession.cpp
--- a/terminalsecurity/SCP/SCPServer/src/SCPSession.cpp	Mon Mar 08 21:44:11 2010 +0000
+++ b/terminalsecurity/SCP/SCPServer/src/SCPSession.cpp	Sun Mar 14 13:12:06 2010 +0000
@@ -1665,6 +1665,7 @@
 	TInt ret = lChangeArray.Append(lChange);
 	
 	if(KErrNone != ret) {
+		CleanupStack :: PopAndDestroy(); //lChangeArray
 		return;
 	}