# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1271422367 -10800
# Node ID 19fb38abab1de421a533f33b2e2ddb828a3f66c6
# Parent  3f7d9dbe57c85476cb22ac2cbfb9da20eae72f0e
Revision: 201011
Kit: 201015

diff -r 3f7d9dbe57c8 -r 19fb38abab1d dcmofw/dcmoclient/group/dcmoclient.mmp
--- a/dcmofw/dcmoclient/group/dcmoclient.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/dcmofw/dcmoclient/group/dcmoclient.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -35,5 +35,3 @@
 LIBRARY         euser.lib
 LIBRARY         featmgr.lib
 LIBRARY       	flogger.lib
-
-SMPSAFE
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d dcmofw/dcmocustcmd/group/dcmostartupcustcmd.mmp
--- a/dcmofw/dcmocustcmd/group/dcmostartupcustcmd.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/dcmofw/dcmocustcmd/group/dcmostartupcustcmd.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -40,5 +40,3 @@
 LIBRARY		  	 	dcmoclient.lib
 LIBRARY					featmgr.lib
 DEBUGLIBRARY    flogger.lib
-
-SMPSAFE
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d dcmofw/dcmoserver/group/bld.inf
--- a/dcmofw/dcmoserver/group/bld.inf	Tue Feb 02 00:44:00 2010 +0200
+++ b/dcmofw/dcmoserver/group/bld.inf	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d dcmofw/dcmoserver/group/dcmoserver.mmp
--- a/dcmofw/dcmoserver/group/dcmoserver.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/dcmofw/dcmoserver/group/dcmoserver.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -48,5 +48,3 @@
 LIBRARY       centralrepository.lib
 LIBRARY				aknnotify.lib eiksrv.lib
 LIBRARY    		flogger.lib
-
-SMPSAFE
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d dcmofw/group/bld.inf
--- a/dcmofw/group/bld.inf	Tue Feb 02 00:44:00 2010 +0200
+++ b/dcmofw/group/bld.inf	Fri Apr 16 15:52:47 2010 +0300
@@ -17,7 +17,8 @@
 #include <platform_paths.hrh>
 
 PRJ_EXPORTS
-../rom/dcmofw.iby			CORE_MW_LAYER_IBY_EXPORT_PATH(dcmofw.iby)
+../rom/dcmofw.iby				CORE_MW_LAYER_IBY_EXPORT_PATH(dcmofw.iby)
+../rom/dcmofwresources.iby			LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(dcmofwresources.iby)
 
 PRJ_MMPFILES
 #include "../dcmoclient/group/bld.inf"
diff -r 3f7d9dbe57c8 -r 19fb38abab1d dcmofw/rom/dcmofwresources.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dcmofw/rom/dcmofwresources.iby	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,27 @@
+/*
+* 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:   Image description file for project dcmofw
+*
+*/
+
+
+#ifndef _DCMOFWRESOURCES_IBY_
+#define _DCMOFWRESOURCES_IBY_
+
+
+#ifdef FF_RUNTIME_DEVICE_CAPABILITY_CONFIGURATION
+data=DATAZ_\RESOURCE_FILES_DIR\dcmo.rsc	RESOURCE_FILES_DIR\dcmo.rsc
+#endif
+#endif
+
diff -r 3f7d9dbe57c8 -r 19fb38abab1d devicediagnosticsfw/diagpluginbase/src/diagpluginwaitingdialogwrapper.cpp
--- a/devicediagnosticsfw/diagpluginbase/src/diagpluginwaitingdialogwrapper.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/devicediagnosticsfw/diagpluginbase/src/diagpluginwaitingdialogwrapper.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -58,8 +58,8 @@
     // Dialog must not be NULL
     __ASSERT_ALWAYS( iWaitingDialog, Panic( EDiagPluginBasePanicBadArgument ) );
 
-    // Coverity Change .....  Dialog must have EEikDialogFlagWait flag set
-    __ASSERT_ALWAYS( (iWaitingDialog->DialogFlags() & EEikDialogFlagWait),
+    // Dialog must have EEikDialogFlagWait flag set
+    __ASSERT_ALWAYS( !(iWaitingDialog->DialogFlags() & EEikDialogFlagWait),
                      Panic( EDiagPluginBasePanicBadArgument ) );
     }
 
diff -r 3f7d9dbe57c8 -r 19fb38abab1d devicediagnosticsfw/diagpluginbase/src/diagtestpluginbase.cpp
--- a/devicediagnosticsfw/diagpluginbase/src/diagtestpluginbase.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/devicediagnosticsfw/diagpluginbase/src/diagtestpluginbase.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -186,10 +186,10 @@
         TRAPD( err, StopAndCleanupL() );
         if ( err != KErrNone )
             {
-            LOGSTRING3( "CDiagTestPluginBase::~CDiagTestPluginBase(). "
+            /*LOGSTRING3( "CDiagTestPluginBase::~CDiagTestPluginBase(). "
                 L"StopAndCleaupL() failed Uid = 0x%08x , err = %d",
                 Uid(),
-                err );
+                err );*/
             }
 
         // Call DestroyedImplementation only if it was set.
diff -r 3f7d9dbe57c8 -r 19fb38abab1d fotaapplication/fotaserver/FotaEngine/SRC/fotaengstream.cpp
--- a/fotaapplication/fotaserver/FotaEngine/SRC/fotaengstream.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/fotaapplication/fotaserver/FotaEngine/SRC/fotaengstream.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -99,6 +99,9 @@
     // Define write area
     TUint8* p1 = iMyWriteStream->iFotaEngineSession->iChunk.Base();
     TUint8* p2;
+    p2 = p1 + chunksize;
+    
+    /* // dead code
     if ( limitedwritearea == -1 ) 
         {
         p2 = p1 + chunksize;
@@ -107,6 +110,7 @@
         {
         p2 = p1 + limitedwritearea;
         }
+        */
     SetBuf  (a,p1 , p2 );
   	FLOG(_L("TDP2StreamBuf::ResetL() <<" ));
     }
diff -r 3f7d9dbe57c8 -r 19fb38abab1d fotaapplication/fotaserver/FotaEngine/group/fotaengine.mmp
--- a/fotaapplication/fotaserver/FotaEngine/group/fotaengine.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/fotaapplication/fotaserver/FotaEngine/group/fotaengine.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -55,6 +55,4 @@
 LIBRARY			centralrepository.lib
 LIBRARY	flogger.lib
 
-SMPSAFE
-
 //End of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d fotaapplication/fotaserver/FotaRfsPlugin/group/RfsFotaPlugin.mmp
--- a/fotaapplication/fotaserver/FotaRfsPlugin/group/RfsFotaPlugin.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/fotaapplication/fotaserver/FotaRfsPlugin/group/RfsFotaPlugin.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -47,5 +47,3 @@
 LIBRARY euser.lib       // Base library
 LIBRARY ecom.lib	    // ECom library
 LIBRARY flogger.lib
-
-SMPSAFE
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d fotaapplication/fotaserver/FotaScheduleHandler/group/fotaschedulehandler.mmp
--- a/fotaapplication/fotaserver/FotaScheduleHandler/group/fotaschedulehandler.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/fotaapplication/fotaserver/FotaScheduleHandler/group/fotaschedulehandler.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -54,4 +54,4 @@
 LIBRARY	fotaengine.lib
 LIBRARY	flogger.lib
 
-SMPSAFE
\ No newline at end of file
+
diff -r 3f7d9dbe57c8 -r 19fb38abab1d fotaapplication/fotaserver/FotaServer/group/fotaserver.mmp
--- a/fotaapplication/fotaserver/FotaServer/group/fotaserver.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/fotaapplication/fotaserver/FotaServer/group/fotaserver.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -125,4 +125,3 @@
 LIBRARY    flogger.lib
 // #endif
 
-SMPSAFE
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d fotaapplication/fotaserver/FotaServer/src/DevEncProgressObserver.cpp
--- a/fotaapplication/fotaserver/FotaServer/src/DevEncProgressObserver.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/fotaapplication/fotaserver/FotaServer/src/DevEncProgressObserver.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -33,7 +33,7 @@
 // This method can leave
 // -----------------------------------------------------------------------------
 
-CDevEncProgressObserver* CDevEncProgressObserver::NewL(CDevEncController* aObserver, TInt aResource)
+EXPORT_C CDevEncProgressObserver* CDevEncProgressObserver::NewL(CDevEncController* aObserver, TInt aResource)
     {
     CDevEncProgressObserver* self = CDevEncProgressObserver::NewLC(aObserver, aResource);
     CleanupStack::Pop(self);
@@ -46,7 +46,7 @@
 // This method can leave
 // -----------------------------------------------------------------------------
 
-CDevEncProgressObserver* CDevEncProgressObserver::NewLC(CDevEncController* aObserver, TInt aResource)
+EXPORT_C CDevEncProgressObserver* CDevEncProgressObserver::NewLC(CDevEncController* aObserver, TInt aResource)
     {
     CDevEncProgressObserver* self = new (ELeave) CDevEncProgressObserver (aObserver);
     CleanupStack::PushL(self);
diff -r 3f7d9dbe57c8 -r 19fb38abab1d fotaapplication/fotaserver/FotaServer/src/FotaServer.cpp
--- a/fotaapplication/fotaserver/FotaServer/src/FotaServer.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/fotaapplication/fotaserver/FotaServer/src/FotaServer.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -761,7 +761,9 @@
         StoragePluginL()->DeleteUpdatePackageL ( iDownloader->iDLState.iPkgId );
         
     // Download not to be restarted, delete
-    if ( iDownloader->iRestartCounter<=0 )
+    if ( iDownloader ) 
+    {
+    	if ( iDownloader->iRestartCounter<=0 )
         {
         // Set downloader's ending state to DB
         iDatabase->OpenDBL();
@@ -809,6 +811,7 @@
         	err = RProperty::Set(TUid::Uid(KOmaDMAppUid), KFotaDMRefresh, EFalse );
         FLOG(_L("RProperty KFotaDMRefresh EFalse, err = %d"), err);
         }
+      }
     // Download to be restarted
     else
         {
diff -r 3f7d9dbe57c8 -r 19fb38abab1d fotaapplication/fotaserver/FotaServer/src/fotadownload.cpp
--- a/fotaapplication/fotaserver/FotaServer/src/fotadownload.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/fotaapplication/fotaserver/FotaServer/src/fotadownload.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -36,7 +36,9 @@
 #include <es_sock_partner.h>
 #endif
 #include <es_enum.h>
-#include <NSmlDMSync.rsg>	//OMA DM UI for reading resource
+//Commented for resolving APP dependencyy
+//#include <nsmldmsync.rsg>	//OMA DM UI for reading resource
+//Comment ends here
 #include <bautils.h>
 #include <StringLoader.h>
 #include <DevManInternalCRKeys.h> //for reading san feature
@@ -1175,7 +1177,8 @@
 	    delete centrep;
 	    }
 	centrep = NULL;
-
+//Commented for resolving APP dependency
+/*
 	if (iUserInitiatedResume || 
 	        (behavior == EOmacdOffdlprgOn || behavior == EOmacdOndlprgOn))
 		{
@@ -1212,6 +1215,8 @@
 	
 		iDLProgressDlg->RunLD();
 		}
+*/
+//Comment ends here
 	FLOG(_L("CFotaDownload::ResumeDownloadL, Stage 1"));
 	
 	iDownload = RetrieveDownloadL();
diff -r 3f7d9dbe57c8 -r 19fb38abab1d fotaapplication/fotaserver/FotaServer/src/fotaupdate.cpp
--- a/fotaapplication/fotaserver/FotaServer/src/fotaupdate.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/fotaapplication/fotaserver/FotaServer/src/fotaupdate.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -1652,7 +1652,7 @@
     TScheduleEntryInfo2                     ret;
     TInt                                    err;    
     RScheduler                              sc;
-    TTime                                   t; 
+    
     TTsTime                                 time;
     TSchedulerItemRef                       scitem; 
     CArrayFixFlat<TSchedulerItemRef>*     	aSchRefArray = new CArrayFixFlat <TSchedulerItemRef>(5);
diff -r 3f7d9dbe57c8 -r 19fb38abab1d fotaapplication/fotaserver/FotaStorage/group/fotadiskstorage.mmp
--- a/fotaapplication/fotaserver/FotaStorage/group/fotadiskstorage.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/fotaapplication/fotaserver/FotaStorage/group/fotadiskstorage.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -61,4 +61,4 @@
 LIBRARY			flogger.lib
 LIBRARY			sysutil.lib
 
-SMPSAFE
+
diff -r 3f7d9dbe57c8 -r 19fb38abab1d fotaapplication/fotaserver/FotaStorage/group/fotastorage.mmp
--- a/fotaapplication/fotaserver/FotaStorage/group/fotastorage.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/fotaapplication/fotaserver/FotaStorage/group/fotastorage.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -52,5 +52,4 @@
 LIBRARY			estor.lib
 LIBRARY			efsrv.lib
 
-SMPSAFE
 
diff -r 3f7d9dbe57c8 -r 19fb38abab1d fotaapplication/fotaserver/FotaStorage/src/fotaDiskStorage.cpp
--- a/fotaapplication/fotaserver/FotaStorage/src/fotaDiskStorage.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/fotaapplication/fotaserver/FotaStorage/src/fotaDiskStorage.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -159,9 +159,12 @@
 					isavailable = CFotaStorage::EFitsToFileSystem;
         	}
         }
+        TInt fitstodummy = isavailable==CFotaStorage::EFitsToReservation?1:0 ;
+        TInt fitstoFS = isavailable==CFotaStorage::EFitsToFileSystem?1:0 ;
+        TInt DoesntFitToFS = 	isavailable==CFotaStorage::EDoesntFitToFileSystem?1:0 ; 
+        	
     FLOG(_L("CFotaDiskStorage::IsPackageStoreSizeAvailableL %d<%d (sz vs dummy) => fitstodummy:%d fitstoFS:%d DoesntFitToFS:%d")
-        ,aSize,dummySize,isavailable==CFotaStorage::EFitsToReservation?1:0,isavailable==CFotaStorage::EFitsToFileSystem?1:0,isavailable==CFotaStorage::EDoesntFitToFileSystem?1:0
-       );
+        ,aSize,dummySize,fitstodummy,fitstoFS,DoesntFitToFS );
 
     return isavailable;
     }
diff -r 3f7d9dbe57c8 -r 19fb38abab1d fotaapplication/fotaserver/fmsclient/group/fmsclient.mmp
--- a/fotaapplication/fotaserver/fmsclient/group/fmsclient.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/fotaapplication/fotaserver/fmsclient/group/fmsclient.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -43,5 +43,3 @@
 LIBRARY 	  efsrv.lib 
 LIBRARY		  centralrepository.lib
 LIBRARY       flogger.lib
-
-SMPSAFE
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d fotaapplication/fotaserver/fmsclient/inc/fmsclient.h
--- a/fotaapplication/fotaserver/fmsclient/inc/fmsclient.h	Tue Feb 02 00:44:00 2010 +0200
+++ b/fotaapplication/fotaserver/fmsclient/inc/fmsclient.h	Fri Apr 16 15:52:47 2010 +0300
@@ -60,7 +60,7 @@
 		 * @param None
 		 * @return None
 		 */
-		void CancelNotifyForResume();
+		IMPORT_C void CancelNotifyForResume();
 		
 		/**
 		 * Sending the parameters to FMSServer
diff -r 3f7d9dbe57c8 -r 19fb38abab1d fotaapplication/fotaserver/fmserver/group/fmsserver.mmp
--- a/fotaapplication/fotaserver/fmserver/group/fmsserver.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/fotaapplication/fotaserver/fmserver/group/fmsserver.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -52,4 +52,3 @@
 LIBRARY       etelmm.lib 
 LIBRARY       etel.lib 
 
-SMPSAFE
diff -r 3f7d9dbe57c8 -r 19fb38abab1d fotaapplication/fotaserver/fotacustcmds/group/fotacustcmds.mmp
--- a/fotaapplication/fotaserver/fotacustcmds/group/fotacustcmds.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/fotaapplication/fotaserver/fotacustcmds/group/fotacustcmds.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -47,5 +47,3 @@
 LIBRARY         schsvr.lib  
 LIBRARY		apgrfx.lib
 LIBRARY		apparc.lib
-
-SMPSAFE
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d fotaapplication/fotaserver/fotacustcmds/src/fotacustcmdallreasons.cpp
--- a/fotaapplication/fotaserver/fotacustcmds/src/fotacustcmdallreasons.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/fotaapplication/fotaserver/fotacustcmds/src/fotacustcmdallreasons.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -275,7 +275,7 @@
 	FLOG( _L( "[CFotaCustCmdAllReasons]::FindScheduleL()BEGIN " ) );
 	TScheduleEntryInfo2                     ret;    
 	RScheduler                              sc;
-	TTime                                   t; 
+	
 	TTsTime                                 time;
 	TSchedulerItemRef                       scitem; 
 	CArrayFixFlat<TSchedulerItemRef>*     	aSchRefArray = new CArrayFixFlat <TSchedulerItemRef>(5);
diff -r 3f7d9dbe57c8 -r 19fb38abab1d layers.sysdef.xml
--- a/layers.sysdef.xml	Tue Feb 02 00:44:00 2010 +0200
+++ b/layers.sysdef.xml	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d omaprovisioning/pnputil/src/PnpProvUtil.cpp
--- a/omaprovisioning/pnputil/src/PnpProvUtil.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/omaprovisioning/pnputil/src/PnpProvUtil.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -68,7 +68,7 @@
 // Two-phased constructor.
 // -----------------------------------------------------------------------------
 //
-CPnpProvUtil* CPnpProvUtil::NewL()
+EXPORT_C CPnpProvUtil* CPnpProvUtil::NewL()
     {
 
     CPnpProvUtil* self = NewLC();
diff -r 3f7d9dbe57c8 -r 19fb38abab1d omaprovisioning/pnputil/src/PnpUtilImpl.cpp
--- a/omaprovisioning/pnputil/src/PnpUtilImpl.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/omaprovisioning/pnputil/src/PnpUtilImpl.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -904,7 +904,7 @@
 // CPnpUtilImpl::FetchAccessPoint
 // -----------------------------------------------------------------------------
 //
-TInt CPnpUtilImpl::FetchAccessPoint(TUint32& /*aAP*/)
+EXPORT_C TInt CPnpUtilImpl::FetchAccessPoint(TUint32& /*aAP*/)
     {
     // Not used
     return KErrNotSupported;
diff -r 3f7d9dbe57c8 -r 19fb38abab1d omaprovisioning/provisioning/Group/bld.inf
--- a/omaprovisioning/provisioning/Group/bld.inf	Tue Feb 02 00:44:00 2010 +0200
+++ b/omaprovisioning/provisioning/Group/bld.inf	Fri Apr 16 15:52:47 2010 +0300
@@ -50,8 +50,7 @@
 //../ProvisioningCx/loc/ProvisioningCx.loc					MW_LAYER_LOC_EXPORT_PATH(provisioningcx.loc)
 ../StreamingAdapter/loc/StreamingAdapter.loc				MW_LAYER_LOC_EXPORT_PATH(streamingadapter.loc)
 ../AuthTypePlugin/loc/Authtypeplugin.loc 					MW_LAYER_LOC_EXPORT_PATH(authtypeplugin.loc)
-../accesspointadapter/loc/WPAPAdapter.loc                       MW_LAYER_LOC_EXPORT_PATH(wpapadapter.loc)
-../cpdestinationnwadapter/loc/wpdestinationnwadapter.loc	MW_LAYER_LOC_EXPORT_PATH(wpdestinationnwadapter.loc)
+
 
 PRJ_EXTENSIONS
 #ifdef SBSV2
@@ -89,22 +88,24 @@
 ../ProvisioningEngine/Group/ProvisioningEngine.mmp
 ../ProvisioningParser/Group/ProvisioningParser.mmp
 ../ProvisioningHandler/Group/ProvisioningHandler.mmp
-../accesspointadapter/group/WPAPAdapter.mmp
-../WAPAdapter/Group/WPWAPAdapter.mmp
-../IMAdapter/Group/IMAdapter.mmp
-../StreamingAdapter/Group/StreamingAdapter.mmp
+
+/* Commented to avoid APP layer dependency
+//../accesspointadapter/group/WPAPAdapter.mmp
+//../WAPAdapter/group/WPWAPAdapter.mmp
+//../IMAdapter/group/IMAdapter.mmp
+//../StreamingAdapter/group/StreamingAdapter.mmp
 //../ProvisioningCx/group/ProvisioningCx.mmp
-../ProvisioningBC/Group/ProvisioningBC.mmp
-../MbxNbrAdapter/Group/MbxNbrAdapter.mmp
-../cpdestinationnwadapter/group/wpdestinationnwadapter.mmp
+//../ProvisioningBC/group/ProvisioningBC.mmp 
+//../MbxNbrAdapter/group/MbxNbrAdapter.mmp
+ comment ends here */
 
 
-
-../AuthTypePlugin/Group/Authtypeplugin.mmp
-../alwaysonadapter/Group/alwaysonadapter.mmp
+//../AuthtypePlugin/group/Authtypeplugin.mmp
+//../AlwaysOnAdapter/group/AlwaysOnAdapter.mmp
+//../cpdestinationnwadapter/group/wpdestinationnwadapter.mmp
 
 #ifdef __SMART_CARD_PROV
-    ../ProvisioningSC/Group/ProvisioningSC.mmp
+//    ../ProvisioningSC/group/ProvisioningSC.mmp - commented
 #endif
 
 
@@ -113,12 +114,12 @@
 gnumakefile ../ProvisioningCx/group/iconscxdc.mk
 
 #ifdef __SCALABLE_ICONS
-    gnumakefile ../ProvisioningCx/group/Iconscxaifscalabledc.mk
+   // gnumakefile ../provisioningcx/group/Iconscxaifscalabledc.mk - commented
 #else
-    gnumakefile ../provisioningcx/group/Iconscxaifbitmaps.mk
+   // gnumakefile ../provisioningcx/group/Iconscxaifbitmaps.mk - commented
 #endif
 
-gnumakefile ../AuthTypePlugin/Group/AuthtypePluginIcons.mk
+//gnumakefile ../AuthtypePlugin/group/AuthtypepluginIcons.mk - commented
 
 #endif
 
diff -r 3f7d9dbe57c8 -r 19fb38abab1d omaprovisioning/provisioning/MbxNbrAdapter/Group/MbxNbrAdapter.mmp
--- a/omaprovisioning/provisioning/MbxNbrAdapter/Group/MbxNbrAdapter.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/omaprovisioning/provisioning/MbxNbrAdapter/Group/MbxNbrAdapter.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -55,7 +55,7 @@
 LIBRARY         euser.lib
 LIBRARY         provisioningengine.lib
 LIBRARY         commonengine.lib
-LIBRARY         vmbx.lib
+//LIBRARY         vmbx.lib
 LIBRARY 		centralrepository.lib
 
 DEBUGLIBRARY    flogger.lib
diff -r 3f7d9dbe57c8 -r 19fb38abab1d omaprovisioning/provisioning/MbxNbrAdapter/Src/MbxNbrAdapter.cpp
--- a/omaprovisioning/provisioning/MbxNbrAdapter/Src/MbxNbrAdapter.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/omaprovisioning/provisioning/MbxNbrAdapter/Src/MbxNbrAdapter.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -21,7 +21,7 @@
 #include    <CWPCharacteristic.h>
 #include    <CWPParameter.h>
 #include    <wpmbxnbradapterresource.rsg>
-#include    <vmnumber.h>
+//#include    <vmnumber.h>
 #include    <commonphoneparser.h>
 #include 	<voicemailboxdomaincrkeys.h>
 #include 	<centralrepository.h>
@@ -156,21 +156,21 @@
     __ASSERT_DEBUG( iSettings.Count() > aItem, User::Leave( KErrCorrupt ) ); 
     __ASSERT_DEBUG( aItem >= 0, User::Leave( KErrCorrupt ) ); 
    
-    RVmbxNumber model;
-    User::LeaveIfError( model.Open() );
-    CleanupClosePushL( model );  
+    //RVmbxNumber model;
+    //User::LeaveIfError( model.Open() );
+    //CleanupClosePushL( model );  
        
     TInt err( KErrNone );    
     switch( iSettings[aItem].iMailboxType )
         {
         case ECSVoiceMailbox:
-            err = model.SaveVmbxNumber( iSettings[aItem].iMailboxNumber, 
-                                        EAlsActiveLineEntry );
+            //err = model.SaveVmbxNumber( iSettings[aItem].iMailboxNumber, 
+            //                            EAlsActiveLineEntry );
             break;
         case ECSVideoMailbox:
         FLOG( _L( "[Provisioning] CMbxNbrAdapter::SaveL:case ECSVideoMailbox" ) );
-            err = model.SaveVideoMbxNumber( iSettings[aItem].iMailboxNumber, 
-                                            EAlsActiveLineEntry );        
+            //err = model.SaveVideoMbxNumber( iSettings[aItem].iMailboxNumber, 
+            //                                EAlsActiveLineEntry );        
             if ( iSettings[aItem].iIsVideosupport )
             {
             CRepository* cenrep = CRepository::NewL( KCRUidVideoMailbox );
diff -r 3f7d9dbe57c8 -r 19fb38abab1d omaprovisioning/provisioning/ProvisioningBC/Src/CWPSaver.cpp
--- a/omaprovisioning/provisioning/ProvisioningBC/Src/CWPSaver.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/omaprovisioning/provisioning/ProvisioningBC/Src/CWPSaver.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -316,21 +316,10 @@
         }
     }
 
-// ----------------------------------------------------------------------------
-// CWPSaver::GetNumAccessDenied
-// ----------------------------------------------------------------------------
-//
-    
 TInt CWPSaver::GetNumAccessDenied()
     {
     return iNumAccessDenied;
     }	
-
-// ----------------------------------------------------------------------------
-// CWPSaver::SetNumAccessDenied
-// ----------------------------------------------------------------------------
-//
-        
 void CWPSaver::SetNumAccessDenied(TInt aNumAccessDenied )
     {
     iNumAccessDenied = aNumAccessDenied;
diff -r 3f7d9dbe57c8 -r 19fb38abab1d omaprovisioning/provisioning/ProvisioningHandler/Group/ProvisioningHandler.mmp
--- a/omaprovisioning/provisioning/ProvisioningHandler/Group/ProvisioningHandler.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/omaprovisioning/provisioning/ProvisioningHandler/Group/ProvisioningHandler.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -53,7 +53,6 @@
 
 APP_LAYER_SYSTEMINCLUDE
 SYSTEMINCLUDE 	/epoc32/include/ecom
-SYSTEMINCLUDE 	/epoc32/include/push
 #ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
 SYSTEMINCLUDE 	/epoc32/include/platform/mw/push
 #endif
diff -r 3f7d9dbe57c8 -r 19fb38abab1d omaprovisioning/provisioning/Rom/Provisioning.iby
--- a/omaprovisioning/provisioning/Rom/Provisioning.iby	Tue Feb 02 00:44:00 2010 +0200
+++ b/omaprovisioning/provisioning/Rom/Provisioning.iby	Fri Apr 16 15:52:47 2010 +0300
@@ -37,6 +37,7 @@
 // Streaming Adapter
 ECOM_PLUGIN(WPStreamingAdapter.dll,101F85CB.rsc)
 
+
 //Accesspoint adapter
 ECOM_PLUGIN(WPAPAdapter.dll, WPAPAdapter.rsc)
 
diff -r 3f7d9dbe57c8 -r 19fb38abab1d omaprovisioning/provisioning/Rom/ProvisioningResources.iby
--- a/omaprovisioning/provisioning/Rom/ProvisioningResources.iby	Tue Feb 02 00:44:00 2010 +0200
+++ b/omaprovisioning/provisioning/Rom/ProvisioningResources.iby	Fri Apr 16 15:52:47 2010 +0300
@@ -34,7 +34,8 @@
 
 //data=DATAZ_\RESOURCE_FILES_DIR\WPSIPAdapterResource.rsc                         RESOURCE_FILES_DIR\WPSIPAdapter.rsc
 
-
+data=DATAZ_\RESOURCE_FILES_DIR\WPAPAdapterResource.rsc                          RESOURCE_FILES_DIR\WPAPAdapterResource.rsc
+data=DATAZ_\RESOURCE_FILES_DIR\wpdestinationnwadapter.rsc                       RESOURCE_FILES_DIR\wpdestinationnwadapter.rsc
 
 // Resource files for OMA Provisioning
 
@@ -52,7 +53,4 @@
   data=DATAZ_\RESOURCE_FILES_DIR\AuthtypepluginRsc.rsc            RESOURCE_FILES_DIR\AuthtypepluginRsc.rsc
 #endif
 
-data=DATAZ_\RESOURCE_FILES_DIR\WPAPAdapterResource.rsc      RESOURCE_FILES_DIR\WPAPAdapterResource.rsc
-data=DATAZ_\RESOURCE_FILES_DIR\wpdestinationnwadapter.rsc   RESOURCE_FILES_DIR\wpdestinationnwadapter.rsc
-
 #endif // __PROVISIONINGRESOURCES_IBY__
diff -r 3f7d9dbe57c8 -r 19fb38abab1d omaprovisioning/provisioning/help/inc/prov.hlp.hrh
--- a/omaprovisioning/provisioning/help/inc/prov.hlp.hrh	Tue Feb 02 00:44:00 2010 +0200
+++ b/omaprovisioning/provisioning/help/inc/prov.hlp.hrh	Fri Apr 16 15:52:47 2010 +0300
@@ -2,16 +2,17 @@
 * 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"
+* 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.
-*
+* Nokia Corporation - Initial contribution
+* 
 * Contributors:
 * 
-* Description:
+* 
+* Description: Help file
 *
 */
 	
@@ -24,4 +25,4 @@
 
 _LIT(KPROV_HLP_PROVISIONVIEW, "PROV_HLP_PROVISIONVIEW"); // 
 
-#endif 
\ No newline at end of file
+#endif 
diff -r 3f7d9dbe57c8 -r 19fb38abab1d package_definition.xml
--- a/package_definition.xml	Tue Feb 02 00:44:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,185 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="remotemgmt" name="Remote Management" levels="plugin framework server generic specific">
-    <collection id="omaprovisioning" name="OMA Provisioning" level="specific">
-      <component id="pnputil" filter="s60" name="PnP Util">
-        <unit bldFile="omaprovisioning/pnputil/group"/>
-        <!-- should the test bld.inf be #included? -->
-        <!-- <unit bldFile="omaprovisioning/pnputil/tsrc/moduletest/group"/> -->
-      </component>
-      <component id="provisioning" filter="s60" name="Provisioning">
-        <unit bldFile="omaprovisioning/provisioning/group"/>
-        <!-- should the test bld.inf be #included? -->
-        <!-- <unit bldFile="omaprovisioning/provisioning/tsrc/moduletest/group"/> -->
-      </component>
-    </collection>
-    <collection id="policymanagement" name="Policy Management" level="generic">
-      <component id="pmdmadapter" filter="s60" name="PM DM Adapter" class="plugin">
-        <unit bldFile="policymanagement/pmdmadapter/group"/>
-      </component>
-      <component id="dmutilserver" filter="s60" name="DM Util Server">
-        <unit bldFile="policymanagement/dmutilserver/group"/>
-      </component>
-      <component id="policyengine" filter="s60" name="Policy Engine">
-        <unit bldFile="policymanagement/policyengine/group"/>
-      </component>
-      <component id="policymanagement_build" filter="s60" name="Policy Management Build">
-      	<!--  should un#include above units-->
-        <unit bldFile="policymanagement/group"/>
-      </component>
-    </collection>
-    <collection id="syncmlfw" name="SyncML Framework" level="server">
-      <component id="syncmlfw_common" filter="s60" name="SyncML Framework Common">
-      	<!-- can only have one unit, need to have these #included from a single bld.inf -->
-        <unit bldFile="syncmlfw/common/alerthandler/bld"/>
-        <unit bldFile="syncmlfw/common/alertqueue/bld"/>
-        <unit bldFile="syncmlfw/common/debug/bld"/>
-        <unit bldFile="syncmlfw/common/historylog/bld"/>
-        <unit bldFile="syncmlfw/common/http/bld"/>
-        <unit bldFile="syncmlfw/common/inc"/>
-        <unit bldFile="syncmlfw/common/inc/modifiedheaders"/>
-        <unit bldFile="syncmlfw/common/inc/policy"/>
-        <unit bldFile="syncmlfw/common/inc/symbianheaders"/>
-        <unit bldFile="syncmlfw/common/notifiers/inc"/>
-        <unit bldFile="syncmlfw/common/obex/obexclient/bld"/>
-        <unit bldFile="syncmlfw/common/obex/obexcommserver/bld"/>
-        <unit bldFile="syncmlfw/common/obex/obexdmplugin/bld"/>
-        <unit bldFile="syncmlfw/common/obex/obexdsplugin/bld"/>
-        <unit bldFile="syncmlfw/common/obex/obexserverbinding/bld"/>
-        <unit bldFile="syncmlfw/common/sosserver/bld"/>
-        <unit bldFile="syncmlfw/common/sosserver_clientapi/bld"/>
-        <unit bldFile="syncmlfw/common/sosserver_privateapi/bld"/>
-        <unit bldFile="syncmlfw/common/sosserver_transporthandler/bld"/>
-        <unit bldFile="syncmlfw/common/syncagent/bld"/>
-        <unit bldFile="syncmlfw/common/transport/bld"/>
-        <unit bldFile="syncmlfw/common/wbxml/bld"/>
-        <unit bldFile="syncmlfw/common/xml/bld"/>
-      </component>
-      <component id="ds" filter="s60" name="Data Sync">
-      	<!-- can only have one unit, need to have these #included from a single bld.inf -->
-        <unit bldFile="syncmlfw/ds/adapterlog/bld"/>
-        <unit bldFile="syncmlfw/ds/adapters/dataproviderbase/bld"/>
-        <unit bldFile="syncmlfw/ds/agentlog/bld"/>
-        <unit bldFile="syncmlfw/ds/alerthandler/bld"/>
-        <unit bldFile="syncmlfw/ds/dsutils/changefinder/bld"/>
-        <unit bldFile="syncmlfw/ds/dsutils/dbcaps/bld"/>
-        <unit bldFile="syncmlfw/ds/dsutils/filter/bld"/>
-        <unit bldFile="syncmlfw/ds/dsutils/filterutils/bld"/>
-        <unit bldFile="syncmlfw/ds/dsutils/profileutil/bld"/>
-        <unit bldFile="syncmlfw/ds/dsutils/storeformat/bld"/>
-        <unit bldFile="syncmlfw/ds/hostserver/dshostclient/bld"/>
-        <unit bldFile="syncmlfw/ds/hostserver/dshostserverbase/bld"/>
-        <unit bldFile="syncmlfw/ds/hostserver/dshostservers/bld"/>
-        <unit bldFile="syncmlfw/ds/inc"/>
-        <unit bldFile="syncmlfw/ds/netmon/bld"/>
-        <!-- <unit bldFile="syncmlfw/ds/ota/bld"/> -->
-        <unit bldFile="syncmlfw/ds/provisioningadapter/bld"/>
-        <unit bldFile="syncmlfw/ds/settings/bld"/>
-        <unit bldFile="syncmlfw/ds/syncagent/bld"/>
-        <unit bldFile="syncmlfw/ds/wappushalert/bld"/>
-      </component>
-      <component id="dm" filter="s60" name="Device Management">
-      	<!-- can only have one unit, need to have these #included from a single bld.inf -->
-        <unit bldFile="syncmlfw/dm/bld"/>
-        <unit bldFile="syncmlfw/dm/callbackserver/bld"/>
-        <unit bldFile="syncmlfw/dm/dmutils/bld"/>
-        <unit bldFile="syncmlfw/dm/hostserver/dmhostserverbase/bld"/>
-        <unit bldFile="syncmlfw/dm/hostserver/dmhostservers/bld"/>
-        <unit bldFile="syncmlfw/dm/provisioningadapter/bld"/>
-        <unit bldFile="syncmlfw/dm/settings/bld"/>
-        <unit bldFile="syncmlfw/dm/syncagent/bld"/>
-        <unit bldFile="syncmlfw/dm/treedbclient/bld"/>
-        <unit bldFile="syncmlfw/dm/treedbhandler/bld"/>
-        <unit bldFile="syncmlfw/dm/treemodule/bld"/>
-        <!-- <unit bldFile="syncmlfw/dm/tsrc/group"/> -->
-        <unit bldFile="syncmlfw/dm/wappushalert/bld"/>
-      </component>
-      <component id="syncmlnotifier" filter="s60" name="SyncML Notifier">
-        <unit bldFile="syncmlfw/syncmlnotifier/group"/>
-      </component>
-      <component id="syncservice" filter="s60" name="Sync Service">
-        <unit bldFile="syncmlfw/syncservice/group"/>
-      </component>
-      <component id="syncmlfw_build" filter="s60" name="SyncML Framework Build">
-      	<!-- should un#include the above as necessary -->
-        <unit bldFile="syncmlfw/group"/>
-      </component>
-    </collection>
-    <collection id="terminalsecurity" name="Terminal Security" level="specific">
-      <component id="scp" filter="s60" name="Security Code Proxy">
-      	<!-- can only have one unit, need to have these #included from a single bld.inf -->
-        <unit bldFile="terminalsecurity/scp/scpclient/group"/>
-        <unit bldFile="terminalsecurity/scp/scphistoryplugin/group"/>
-        <unit bldFile="terminalsecurity/scp/scppatternplugin/group"/>
-        <unit bldFile="terminalsecurity/scp/scpserver/group"/>
-        <unit bldFile="terminalsecurity/scp/scptimestampplugin/group"/>
-      </component>
-      <component id="terminalsecurity_client" filter="s60" name="Terminal Control Client">
-        <unit bldFile="terminalsecurity/client/group"/>
-      </component>
-      <component id="terminalsecurity_server" filter="s60" name="Terminal Control Server">
-        <unit bldFile="terminalsecurity/server/group"/>
-      </component>
-      <component id="tcadapter" filter="s60" name="Terminal Control Adapter">
-        <unit bldFile="terminalsecurity/tcadapter/bld"/>
-      </component>
-      <component id="terminalsecurity_build" filter="s60" name="Terminal Security Build">
-        <unit bldFile="terminalsecurity/group"/>
-      </component>
-    </collection>
-    <collection id="devicediagnosticsfw" name="Device Diagnostics Framework" level="framework">
-      <component id="diagframework" filter="s60" name="Diagnostics Framework">
-        <unit bldFile="devicediagnosticsfw/diagframework/group"/>
-      </component>
-      <component id="diagpluginbase" filter="s60" name="Diagnostics Plugin Base">
-        <unit bldFile="devicediagnosticsfw/diagpluginbase/group"/>
-      </component>
-      <component id="diagresultsdb" filter="s60" name="Diagnostics Results Database">
-     	<!--  can only have one unit, merge or split into two components -->
-        <unit bldFile="devicediagnosticsfw/diagresultsdb/client/group"/>
-        <unit bldFile="devicediagnosticsfw/diagresultsdb/server/group"/>
-      </component>
-      <component id="devicediagnosticsfw_build" filter="s60" name="Device Diagnostics Framework Build">
-        <unit bldFile="devicediagnosticsfw/group"/>
-      </component>
-    </collection>
-    <collection id="fotaapplication" name="FOTA Application" level="generic">
-      <component id="fotaserver" filter="s60" name="FOTA Server">
-		<!-- can only have one unit, need to put the configuration in the appropriate bld.inf -->
-        <unit bldFile="fotaapplication/fotaserver/fotastartupextplg/group"/>
-        <unit bldFile="fotaapplication/fotaserver/group"/>
-        <!-- <unit bldFile="fotaapplication/fotaserver/fmsclient/group"/> -->
-        <!-- <unit bldFile="fotaapplication/fotaserver/fmserver/group"/> -->
-        <!-- <unit bldFile="fotaapplication/fotaserver/fotarfsplugin/group"/> -->
-      </component>
-      <component id="fotaapp" filter="s60" name="FOTA Application">
-		<!-- should be able to get rid of this by configuring the above component -->
-        <unit bldFile="fotaapplication/group"/>
-      </component>
-    </collection>
-    <collection id="remotemgmt_info" name="Remote Management Info" level="specific">
-      <component id="remotemgmt_pub" filter="s60" name="Remote Management Public Interfaces" class="api">
-        <unit bldFile="remotemgmt_pub/group"/>
-      </component>
-      <component id="remotemgmt_plat" filter="s60" name="Remote Management Platform Interfaces" class="api">
-        <unit bldFile="remotemgmt_plat/group"/>
-        	<!--  can these be #included in the above one? -->
-        <!-- <unit bldFile="remotemgmt_plat/common_agent_util_and_definitions_api/tsrc/group"/> -->
-        <!-- <unit bldFile="remotemgmt_plat/data_synchronization_plugin_api/tsrc/group"/> -->
-        <!-- <unit bldFile="remotemgmt_plat/dm_tree_apis/tsrc/group"/> -->
-        <!-- <unit bldFile="remotemgmt_plat/dm_utils_api/tsrc/group"/> -->
-        <!-- <unit bldFile="remotemgmt_plat/fota_engine_api/tsrc/group"/> -->
-        <!-- <unit bldFile="remotemgmt_plat/oma_ds_extensions_api/tsrc/group"/> -->
-        <!-- <unit bldFile="remotemgmt_plat/oma_provisioning_engine_api/tsrc/group"/> -->
-        <!-- <unit bldFile="remotemgmt_plat/pnpms_utils_api/tsrc/group"/> -->
-        <!-- <unit bldFile="remotemgmt_plat/policy_management_certificate_api/tsrc/group"/> -->
-        <!-- <unit bldFile="remotemgmt_plat/policy_management_request_api/tsrc/group"/> -->
-        <!-- <unit bldFile="remotemgmt_plat/scp_server_api/tsrc/group"/> -->
-        <!-- <unit bldFile="remotemgmt_plat/setting_enforcement_info_api/tsrc/group"/> -->
-        <!-- <unit bldFile="remotemgmt_plat/syncml_alert_api/tsrc/group"/> -->
-        <!-- <unit bldFile="remotemgmt_plat/syncml_client_api/tsrc/group"/> -->
-        <!-- <unit bldFile="remotemgmt_plat/terminal_security_device_lock_api/tsrc/group"/> -->
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/group/INITIAL_POLICIES.mk
--- a/policymanagement/group/INITIAL_POLICIES.mk	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/group/bld.inf
--- a/policymanagement/group/bld.inf	Tue Feb 02 00:44:00 2010 +0200
+++ b/policymanagement/group/bld.inf	Fri Apr 16 15:52:47 2010 +0300
@@ -28,70 +28,32 @@
 ../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"
diff -r 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/group/genericcopy.flm
--- a/policymanagement/group/genericcopy.flm	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/group/genericcopy.meta
--- a/policymanagement/group/genericcopy.meta	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/group/genericcopy.xml
--- a/policymanagement/group/genericcopy.xml	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/group/initial_policies_apollo30.mk
--- a/policymanagement/group/initial_policies_apollo30.mk	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/group/tarm_format_scripts.cmd
--- a/policymanagement/group/tarm_format_scripts.cmd	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/group/tarm_format_scripts.mk
--- a/policymanagement/group/tarm_format_scripts.mk	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/group/tarm_policy_conf.cmd
--- a/policymanagement/group/tarm_policy_conf.cmd	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/0000000257.txt
--- a/policymanagement/policyengine/Data/0000000257.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/10207815.txt
Binary file policymanagement/policyengine/Data/10207815.txt has changed
diff -r 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/10207816.txt
Binary file policymanagement/policyengine/Data/10207816.txt has changed
diff -r 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/RootIni/0000000257.txt
--- a/policymanagement/policyengine/Data/RootIni/0000000257.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/RootIni/10207815.txt
Binary file policymanagement/policyengine/Data/RootIni/10207815.txt has changed
diff -r 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/RootIni/10207816.txt
Binary file policymanagement/policyengine/Data/RootIni/10207816.txt has changed
diff -r 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/centrepini/10207815.txt
Binary file policymanagement/policyengine/Data/centrepini/10207815.txt has changed
diff -r 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000000257.txt
--- a/policymanagement/policyengine/Data/policies/0000000257.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000000535.txt
--- a/policymanagement/policyengine/Data/policies/0000000535.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000000768.txt
--- a/policymanagement/policyengine/Data/policies/0000000768.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000001047.txt
--- a/policymanagement/policyengine/Data/policies/0000001047.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000001281.txt
--- a/policymanagement/policyengine/Data/policies/0000001281.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000001559.txt
--- a/policymanagement/policyengine/Data/policies/0000001559.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000001793.txt
--- a/policymanagement/policyengine/Data/policies/0000001793.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000002071.txt
--- a/policymanagement/policyengine/Data/policies/0000002071.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000002304.txt
--- a/policymanagement/policyengine/Data/policies/0000002304.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000002583.txt
--- a/policymanagement/policyengine/Data/policies/0000002583.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000002836.txt
--- a/policymanagement/policyengine/Data/policies/0000002836.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000003072.txt
--- a/policymanagement/policyengine/Data/policies/0000003072.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000003351.txt
--- a/policymanagement/policyengine/Data/policies/0000003351.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000003604.txt
--- a/policymanagement/policyengine/Data/policies/0000003604.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000003840.txt
--- a/policymanagement/policyengine/Data/policies/0000003840.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000004119.txt
--- a/policymanagement/policyengine/Data/policies/0000004119.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000004372.txt
--- a/policymanagement/policyengine/Data/policies/0000004372.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000004608.txt
--- a/policymanagement/policyengine/Data/policies/0000004608.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000004887.txt
--- a/policymanagement/policyengine/Data/policies/0000004887.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000005140.txt
--- a/policymanagement/policyengine/Data/policies/0000005140.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000005376.txt
--- a/policymanagement/policyengine/Data/policies/0000005376.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000005655.txt
--- a/policymanagement/policyengine/Data/policies/0000005655.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000005908.txt
--- a/policymanagement/policyengine/Data/policies/0000005908.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000006144.txt
--- a/policymanagement/policyengine/Data/policies/0000006144.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000006423.txt
--- a/policymanagement/policyengine/Data/policies/0000006423.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000006676.txt
--- a/policymanagement/policyengine/Data/policies/0000006676.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000006912.txt
--- a/policymanagement/policyengine/Data/policies/0000006912.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000007191.txt
--- a/policymanagement/policyengine/Data/policies/0000007191.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000007444.txt
--- a/policymanagement/policyengine/Data/policies/0000007444.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000007700.txt
--- a/policymanagement/policyengine/Data/policies/0000007700.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000007936.txt
--- a/policymanagement/policyengine/Data/policies/0000007936.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000008215.txt
--- a/policymanagement/policyengine/Data/policies/0000008215.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000008468.txt
--- a/policymanagement/policyengine/Data/policies/0000008468.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000008724.txt
--- a/policymanagement/policyengine/Data/policies/0000008724.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000008960.txt
--- a/policymanagement/policyengine/Data/policies/0000008960.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000009239.txt
--- a/policymanagement/policyengine/Data/policies/0000009239.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000009492.txt
--- a/policymanagement/policyengine/Data/policies/0000009492.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000009728.txt
--- a/policymanagement/policyengine/Data/policies/0000009728.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000010007.txt
--- a/policymanagement/policyengine/Data/policies/0000010007.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000010260.txt
--- a/policymanagement/policyengine/Data/policies/0000010260.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000010497.txt
--- a/policymanagement/policyengine/Data/policies/0000010497.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000010752.txt
--- a/policymanagement/policyengine/Data/policies/0000010752.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000011028.txt
--- a/policymanagement/policyengine/Data/policies/0000011028.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000011264.txt
--- a/policymanagement/policyengine/Data/policies/0000011264.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000011540.txt
--- a/policymanagement/policyengine/Data/policies/0000011540.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000011777.txt
--- a/policymanagement/policyengine/Data/policies/0000011777.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000012055.txt
--- a/policymanagement/policyengine/Data/policies/0000012055.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000012288.txt
--- a/policymanagement/policyengine/Data/policies/0000012288.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000012567.txt
--- a/policymanagement/policyengine/Data/policies/0000012567.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000012820.txt
--- a/policymanagement/policyengine/Data/policies/0000012820.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000013057.txt
--- a/policymanagement/policyengine/Data/policies/0000013057.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000013335.txt
--- a/policymanagement/policyengine/Data/policies/0000013335.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000013568.txt
--- a/policymanagement/policyengine/Data/policies/0000013568.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000013847.txt
--- a/policymanagement/policyengine/Data/policies/0000013847.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000014080.txt
--- a/policymanagement/policyengine/Data/policies/0000014080.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000014359.txt
--- a/policymanagement/policyengine/Data/policies/0000014359.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000014612.txt
--- a/policymanagement/policyengine/Data/policies/0000014612.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000014868.txt
--- a/policymanagement/policyengine/Data/policies/0000014868.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000015104.txt
--- a/policymanagement/policyengine/Data/policies/0000015104.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000015383.txt
--- a/policymanagement/policyengine/Data/policies/0000015383.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000015636.txt
--- a/policymanagement/policyengine/Data/policies/0000015636.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000015892.txt
--- a/policymanagement/policyengine/Data/policies/0000015892.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000016148.txt
--- a/policymanagement/policyengine/Data/policies/0000016148.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000016404.txt
--- a/policymanagement/policyengine/Data/policies/0000016404.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000016660.txt
--- a/policymanagement/policyengine/Data/policies/0000016660.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000016916.txt
--- a/policymanagement/policyengine/Data/policies/0000016916.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000017172.txt
--- a/policymanagement/policyengine/Data/policies/0000017172.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000017428.txt
--- a/policymanagement/policyengine/Data/policies/0000017428.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000017684.txt
--- a/policymanagement/policyengine/Data/policies/0000017684.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000017940.txt
--- a/policymanagement/policyengine/Data/policies/0000017940.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000018196.txt
--- a/policymanagement/policyengine/Data/policies/0000018196.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000018432.txt
--- a/policymanagement/policyengine/Data/policies/0000018432.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000018711.txt
--- a/policymanagement/policyengine/Data/policies/0000018711.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies/0000018964.txt
--- a/policymanagement/policyengine/Data/policies/0000018964.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000000257.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000000257.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000000535.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000000535.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000000768.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000000768.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000001047.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000001047.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000001281.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000001281.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000001559.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000001559.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000001793.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000001793.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000002071.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000002071.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000002304.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000002304.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000002583.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000002583.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000002836.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000002836.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000003072.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000003072.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000003351.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000003351.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000003604.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000003604.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000003840.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000003840.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000004119.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000004119.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000004372.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000004372.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000004608.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000004608.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000004887.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000004887.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000005140.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000005140.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000005376.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000005376.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000005655.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000005655.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000005908.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000005908.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000006144.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000006144.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000006423.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000006423.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000006676.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000006676.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000006912.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000006912.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000007191.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000007191.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000007444.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000007444.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000007700.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000007700.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000007936.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000007936.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000008215.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000008215.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000008468.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000008468.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000008724.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000008724.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000008960.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000008960.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000009239.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000009239.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000009492.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000009492.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000009729.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000009729.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000009984.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000009984.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000010260.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000010260.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000010496.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000010496.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000010772.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000010772.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000011028.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000011028.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000011284.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000011284.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000011540.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000011540.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000011796.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000011796.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000012052.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000012052.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000012308.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000012308.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000012564.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000012564.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000012820.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000012820.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000013076.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000013076.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000013332.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000013332.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000013569.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000013569.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000013847.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000013847.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000014080.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000014080.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000014359.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000014359.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000014612.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000014612.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000014849.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000014849.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000015127.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000015127.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000015360.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000015360.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000015639.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000015639.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000015872.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000015872.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000016151.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000016151.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000016404.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000016404.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000016660.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000016660.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000016896.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000016896.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000017175.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000017175.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000017428.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000017428.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000017684.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000017684.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000017940.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000017940.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000018196.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000018196.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000018452.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000018452.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000018708.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000018708.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000018964.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000018964.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000019220.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000019220.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000019476.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000019476.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000019732.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000019732.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000019968.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000019968.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000020247.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000020247.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/Data/policies_apollo30/0000020500.txt
--- a/policymanagement/policyengine/Data/policies_apollo30/0000020500.txt	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/group/PolicyEngineServer.mmp
--- a/policymanagement/policyengine/group/PolicyEngineServer.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/policymanagement/policyengine/group/PolicyEngineServer.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -54,7 +54,6 @@
 MW_LAYER_SYSTEMINCLUDE
 APP_LAYER_SYSTEMINCLUDE
 SYSTEMINCLUDE /epoc32/include/xml
-SYSTEMINCLUDE /epoc32/include/comms-infras/commdb/protection
 #ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
 SYSTEMINCLUDE 	/epoc32/include/platform/xml
 SYSTEMINCLUDE 	/epoc32/include/platform/comms-infras/commdb/protection
diff -r 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/group/bld.inf
--- a/policymanagement/policyengine/group/bld.inf	Tue Feb 02 00:44:00 2010 +0200
+++ b/policymanagement/policyengine/group/bld.inf	Fri Apr 16 15:52:47 2010 +0300
@@ -21,19 +21,12 @@
 
 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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/policyenginepolicies/data/0000000257.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/data/0000000257.txt	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/policyenginepolicies/data/10207815.txt
Binary file policymanagement/policyengine/policyenginepolicies/data/10207815.txt has changed
diff -r 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/policyenginepolicies/data/10207816.txt
Binary file policymanagement/policyengine/policyenginepolicies/data/10207816.txt has changed
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/policyenginepolicies/data/RootIni/10207815.txt
Binary file policymanagement/policyengine/policyenginepolicies/data/RootIni/10207815.txt has changed
diff -r 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/policyenginepolicies/data/RootIni/10207816.txt
Binary file policymanagement/policyengine/policyenginepolicies/data/RootIni/10207816.txt has changed
diff -r 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/policyenginepolicies/data/centrepini/10207815.txt
Binary file policymanagement/policyengine/policyenginepolicies/data/centrepini/10207815.txt has changed
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<ps psid="root_element" pcid="pdor">|535|768|1281|10497|11777</ps>
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<desc>Root element of policy system.</desc>
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<po poid="cert_mapping_policy" rcaid="rpor">|1047</po>~257
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<desc>Certificate mapping policy. Policy contains certificate mappings.</desc>
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<ps psid="action_policy_set" pcid="ppor">|1559|1793|9728</ps>~257
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<desc>Action policy set policies.</desc>
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<desc>Settings policy set policies.</desc>
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<ru ruid="email_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~2304
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<ru ruid="syncml_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~3072
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<ru ruid="datasync_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~3840
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<ru ruid="ap_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~4608
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<ru ruid="wlan_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~5376
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<ru ruid="im_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~6144
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<ru ruid="application_management_enforcement_policy_rule1" ef="pe"><ta /></ru>~6912
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<ru ruid="customization_management_enforcement_policy_rule1" ef="pe"><ta /></ru>~7936
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<ru ruid="customization_management_enforcement_policy_permanent" ef="de"><ta /></ru>~7936
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<desc>DCMO policy. This policy is used for DCMO settings.</desc>
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<ru ruid="dcmo_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~8960
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<ps psid="terminal_security_policy_set" pcid="ppor">|10752|11264</ps>~257
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<ps psid="meta_policy_set" pcid="ppor">|12055|12288|13057</ps>~257
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<desc>Meta policy set policies.</desc>
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<po poid="certificate_mapping_rights_policy" rcaid="rpor">|12567|12820</po>~11777
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<desc>Trustedadmin meta policy set policies.</desc>
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<po poid="roles_mapping_policy" rcaid="rpor">|13847</po>~13057
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<po poid="initial_trustedadmin_policy" rcaid="rpor">|14359|14612|14868</po>~13057
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<ps psid="root_element" pcid="pdor">|535|768|1281|9729|13569</ps>
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<desc>Root element of policy system.</desc>
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<po poid="cert_mapping_policy" rcaid="rpor">|1047</po>~257
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<desc>Certificate mapping policy. Policy contains certificate mappings.</desc>
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<ps psid="action_policy_set" pcid="ppor">|1559|1793|8960</ps>~257
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<desc>Action policy set policies.</desc>
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<desc>Settings policy set policies.</desc>
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<ru ruid="email_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~2304
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<ru ruid="syncml_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~3072
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<ru ruid="datasync_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~3840
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<ru ruid="ap_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~4608
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<ru ruid="wlan_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~5376
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<ru ruid="im_enforcement_policy_rule_permanent" ef="de"><ta /></ru>~6144
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<ru ruid="application_management_enforcement_policy_rule1" ef="pe"><ta /></ru>~6912
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<ru ruid="customization_management_enforcement_policy_rule1" ef="pe"><ta /></ru>~7936
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<ru ruid="customization_management_enforcement_policy_permanent" ef="de"><ta /></ru>~7936
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<ps psid="terminal_security_policy_set" pcid="ppor">|9984|10496</ps>~257
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<ps psid="meta_policy_set" pcid="ppor">|13847|14080|14849</ps>~257
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<desc>Meta policy set policies.</desc>
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<po poid="certificate_mapping_rights_policy" rcaid="rpor">|14359|14612</po>~13569
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<desc>Trustedadmin meta policy set policies.</desc>
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<po poid="roles_mapping_policy" rcaid="rpor">|15639</po>~14849
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,1 @@
+<po poid="initial_trustedadmin_policy" rcaid="rpor">|16151|16404|16660</po>~14849
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/policyenginepolicies/group/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policymanagement/policyengine/policyenginepolicies/group/bld.inf	Fri Apr 16 15:52:47 2010 +0300
@@ -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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/policyenginepolicies/rom/10207815.txt
Binary file policymanagement/policyengine/policyenginepolicies/rom/10207815.txt has changed
diff -r 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/policyenginepolicies/rom/10207816.txt
Binary file policymanagement/policyengine/policyenginepolicies/rom/10207816.txt has changed
diff -r 3f7d9dbe57c8 -r 19fb38abab1d 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	Fri Apr 16 15:52:47 2010 +0300
@@ -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 "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 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/policyengineserver/src/OperationParser.cpp
--- a/policymanagement/policyengine/policyengineserver/src/OperationParser.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/policymanagement/policyengine/policyengineserver/src/OperationParser.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -434,7 +434,9 @@
 	// PolicyEngine expects this leave in error conditions -> prgram flow
 	// goes to correct TRAP after this. Can not remove this Leave although
 	// the function name does not have "L"
-	User::Leave( KErrOpParser ); 	
+	
+	// Commented due to RVCT4.0
+	//User::Leave( KErrOpParser ); 	
 }
 
 // -----------------------------------------------------------------------------
diff -r 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/policyengineserver/src/PolicyParser.cpp
--- a/policymanagement/policyengine/policyengineserver/src/PolicyParser.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/policymanagement/policyengine/policyengineserver/src/PolicyParser.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -1014,7 +1014,10 @@
 	{
    	// we need to leave here because Policy Engine traps parser errors, even though
    	// this function does not have L in it's name.
-   	HandleErrorL( ParserErrors::SyntaxError );
+   	//HandleErrorL( ParserErrors::SyntaxError );
+   	
+   	// Ignoreing the leave code due to RVCT4.0
+   	TRAP_IGNORE(HandleErrorL( ParserErrors::SyntaxError ));
 	}
 
 // -----------------------------------------------------------------------------
diff -r 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/policyengineserver/src/SettingEnforcementManager.cpp
--- a/policymanagement/policyengine/policyengineserver/src/SettingEnforcementManager.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/policymanagement/policyengine/policyengineserver/src/SettingEnforcementManager.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -164,7 +164,13 @@
 	//finish active enforcement base
 	if ( iActiveEnforcementBase)
 	{
-		iActiveEnforcementBase->FinishEnforcementL( aFlushSettings);
+		TRAPD(err, iActiveEnforcementBase->FinishEnforcementL( aFlushSettings));
+		
+		if (err != KErrNone)
+			{
+			RDEBUG_2("	**** ERROR, iActiveEnforcementBase->FinishEnforcementL left with %d", err );
+			}
+			
 		delete iActiveEnforcementBase;
 		iActiveEnforcementBase = 0;
 	}
diff -r 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/rom/10207815.txt
Binary file policymanagement/policyengine/rom/10207815.txt has changed
diff -r 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/rom/10207816.txt
Binary file policymanagement/policyengine/rom/10207816.txt has changed
diff -r 3f7d9dbe57c8 -r 19fb38abab1d policymanagement/policyengine/rom/pe_data.iby
--- a/policymanagement/policyengine/rom/pe_data.iby	Tue Feb 02 00:44:00 2010 +0200
+++ /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 3f7d9dbe57c8 -r 19fb38abab1d remotemgmt_plat/device_management_parameter_api/inc/DevManInternalCRKeys.h
--- a/remotemgmt_plat/device_management_parameter_api/inc/DevManInternalCRKeys.h	Tue Feb 02 00:44:00 2010 +0200
+++ b/remotemgmt_plat/device_management_parameter_api/inc/DevManInternalCRKeys.h	Fri Apr 16 15:52:47 2010 +0300
@@ -136,7 +136,7 @@
 * If value is 1  then locked profile values can changed.
 * 
 */
-const TUint32 KDevOverrideProfileLock = 0x0000000F; 
+const TUint32 KDevManEnableHbNotifier = 0x0000000F; 
 
 /*
 * This key is used to store the External memory card status for DCMO
diff -r 3f7d9dbe57c8 -r 19fb38abab1d remotemgmt_plat/fota_engine_api/tsrc/group/fota_engine_api.mmp
--- a/remotemgmt_plat/fota_engine_api/tsrc/group/fota_engine_api.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/remotemgmt_plat/fota_engine_api/tsrc/group/fota_engine_api.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -65,6 +65,4 @@
 // DEFFILE ?filename
 // AIF ?filename
 
-SMPSAFE
-
 // End of File
diff -r 3f7d9dbe57c8 -r 19fb38abab1d remotemgmt_plat/scp_server_api/tsrc/group/scp_autolock_exe.mmp
--- a/remotemgmt_plat/scp_server_api/tsrc/group/scp_autolock_exe.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/remotemgmt_plat/scp_server_api/tsrc/group/scp_autolock_exe.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -49,6 +49,4 @@
 
 LIBRARY		scpclient.lib
 
-SMPSAFE
-
 //end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d remotemgmt_plat/scp_server_api/tsrc/group/scp_server_api.mmp
--- a/remotemgmt_plat/scp_server_api/tsrc/group/scp_server_api.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/remotemgmt_plat/scp_server_api/tsrc/group/scp_server_api.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -56,6 +56,5 @@
 LIBRARY         edbms.lib 
 LIBRARY         charconv.lib
 
-SMPSAFE
 
 // End of File
diff -r 3f7d9dbe57c8 -r 19fb38abab1d remotemgmt_plat/scp_server_api/tsrc/group/scp_terminal_security_exe.mmp
--- a/remotemgmt_plat/scp_server_api/tsrc/group/scp_terminal_security_exe.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/remotemgmt_plat/scp_server_api/tsrc/group/scp_terminal_security_exe.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -47,5 +47,4 @@
 
 LIBRARY		scpclient.lib
 
-SMPSAFE
 // end of file
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d remotemgmt_plat/scp_server_api/tsrc/group/testCSCPParamObject.mmp
--- a/remotemgmt_plat/scp_server_api/tsrc/group/testCSCPParamObject.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/remotemgmt_plat/scp_server_api/tsrc/group/testCSCPParamObject.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -90,6 +90,4 @@
 // DEFFILE ?filename
 // AIF ?filename
 
-SMPSAFE
-
 // End of File
diff -r 3f7d9dbe57c8 -r 19fb38abab1d remotemgmt_plat/terminal_security_device_lock_api/tsrc/group/TestTerminalControl.mmp
--- a/remotemgmt_plat/terminal_security_device_lock_api/tsrc/group/TestTerminalControl.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/remotemgmt_plat/terminal_security_device_lock_api/tsrc/group/TestTerminalControl.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -86,6 +86,4 @@
 // DEFFILE ?filename
 // AIF ?filename
 
-SMPSAFE
-
 // End of File
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/common/http/bld/nsmlhttp.mmp
--- a/syncmlfw/common/http/bld/nsmlhttp.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/syncmlfw/common/http/bld/nsmlhttp.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -45,7 +45,7 @@
 
 
 MW_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE			/epoc32/include/libc /epoc32/include/ecom	/epoc32/include/http
+SYSTEMINCLUDE			/epoc32/include/libc /epoc32/include/ecom
 #ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
 SYSTEMINCLUDE			/epoc32/include/mw/http
 #endif
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/common/http/inc/nsmlhttp.h
--- a/syncmlfw/common/http/inc/nsmlhttp.h	Tue Feb 02 00:44:00 2010 +0200
+++ b/syncmlfw/common/http/inc/nsmlhttp.h	Fri Apr 16 15:52:47 2010 +0300
@@ -41,10 +41,6 @@
 #include "nsmldialiap.h"
 
 #include <rconnmon.h>
-#include <centralrepository.h>
-
-//Central repository key for varying deflate feature
-const TInt KNsmlDsDeflateSupport = 0xA ;
 
 // FORWARD DECLARATION
 class CNSmlXptShutdownTimer;
@@ -174,7 +170,6 @@
 		TServerContentEncoding iServerContentEncoding;
 		TServerContentEncoding iServerAcceptEncoding;
 		TInt iMaxMsgSize;
-		TBool iDeflateFlag;
 
 	private:
 		// methods inherited from MHTTPDataSupplier
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/common/http/src/nsmlhttp.cpp
--- a/syncmlfw/common/http/src/nsmlhttp.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/syncmlfw/common/http/src/nsmlhttp.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -22,7 +22,6 @@
 #include <DevManInternalCRKeys.h>
 #include <centralrepository.h>
 #include "nsmlprivatepskeys.h"
-#include <nsmlconstants.h>
 
 
 #include "nsmlerror.h"
@@ -144,16 +143,6 @@
             iMaxMsgSize = value;
             }
         }
-    
-    CRepository* rep = CRepository::NewLC(KCRUidNSmlDSEngine);
-    TInt flag(0);
-    TRAPD(err, rep->Get(KNsmlDsDeflateSupport, flag));
-    DBG_FILE_CODE(flag, _S8("Flag value"));
-    if ( err == KErrNone )
-        {
-        iDeflateFlag = flag;
-        }
-    CleanupStack::PopAndDestroy(rep);
 	}
 
 // ---------------------------------------------------------
@@ -576,7 +565,7 @@
 	delete iReqBodySubmitBuffer;
     iReqBodySubmitBuffer = NULL;
 	
-	if( (iSession == ESyncMLDSSession) && (iServerAcceptEncoding == ExptDeflate) && iDeflateFlag )
+	if( (iSession == ESyncMLDSSession) && (iServerAcceptEncoding == ExptDeflate) )
 		{
 		TRAPD( err, CompressL(aStartPtr) );
 		User::LeaveIfError( err );
@@ -1081,13 +1070,13 @@
 	SetHeaderL( hdr, HTTP::EAcceptCharset, KSmlAcceptCharSet );
 	SetHeaderL( hdr, HTTP::EAcceptLanguage , KSmlAcceptLanguage );
 		
-	if( iSession == ESyncMLDSSession && iDeflateFlag )//for ds session
-	  {
+	if( iSession == ESyncMLDSSession )//for ds session
+	  { 
 	  if(iServerAcceptEncoding == ExptDeflate)
-          {
-          SetHeaderL( hdr, HTTP::EContentEncoding , KSmlContentDeflate );
-          }
-          SetHeaderL( hdr, HTTP::EAcceptEncoding , KSmlContentDeflate );
+	      {
+	      SetHeaderL( hdr, HTTP::EContentEncoding , KSmlContentDeflate );
+	      }
+	      SetHeaderL( hdr, HTTP::EAcceptEncoding , KSmlContentDeflate );
 	  }
 
 	// Add headers and body data for methods that use request bodies
@@ -1146,7 +1135,7 @@
 		}
 		else
 		{
-		    if ( (iSession == ESyncMLDSSession) && (iServerContentEncoding == ExptDeflate) && iDeflateFlag )
+		    if ( (iSession == ESyncMLDSSession) && (iServerContentEncoding == ExptDeflate) )
 		        {		    
 		        TRAPD( err, DecompressL( aStartPtr ) );		    
 				User::LeaveIfError( err );
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/common/http/src/nsmlhttpclient.cpp
--- a/syncmlfw/common/http/src/nsmlhttpclient.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/syncmlfw/common/http/src/nsmlhttpclient.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -141,31 +141,32 @@
 				break;
 				}
 
-			if(this->iAgent->iSession == ESyncMLDSSession && this->iAgent->iDeflateFlag )
+			if(this->iAgent->iSession == ESyncMLDSSession)
 			    {
-			    RStringF serverContentEncoding = strPool.OpenFStringL( KSmlContentEncodingType );
-                THTTPHdrVal serverContentEncodingValue;
-                if(hdr.GetField( serverContentEncoding, 0, serverContentEncodingValue ) != KErrNotFound)	         
-                    {
-                    RStringF fieldServerContentEncodingValStr = strPool.StringF( serverContentEncodingValue.StrF() ); 
-                    const TDesC8& serverContentEncodingStr = fieldServerContentEncodingValStr.DesC();
-                    if( serverContentEncodingStr == KSmlContentDeflate)
-                        {
-                        this->iAgent->iServerContentEncoding = CNSmlHTTP::ExptDeflate;
-                        }
-                    }
-                RStringF serverAcceptEncoding = strPool.OpenFStringL( KSmlAcceptEncodingType );
-                THTTPHdrVal serverAcceptEncodingValue;
-                if(hdr.GetField( serverAcceptEncoding, 0, serverAcceptEncodingValue )  != KErrNotFound )	         
-                    {
-                    RStringF fieldServerAcceptEncodingValStr = strPool.StringF( serverAcceptEncodingValue.StrF() ); 
-                    const TDesC8& serverAcceptEncodingStr = fieldServerAcceptEncodingValStr.DesC();
-                    if( serverAcceptEncodingStr.Find(KSmlContentDeflate) != KErrNotFound)
-                        {
-                        this->iAgent->iServerAcceptEncoding = CNSmlHTTP::ExptDeflate;
-                        }
-                    }
-    		    }
+    	         RStringF serverContentEncoding = strPool.OpenFStringL( KSmlContentEncodingType );
+    	         THTTPHdrVal serverContentEncodingValue;
+    	         if(hdr.GetField( serverContentEncoding, 0, serverContentEncodingValue ) != KErrNotFound)	         
+    	             {
+        	         RStringF fieldServerContentEncodingValStr = strPool.StringF( serverContentEncodingValue.StrF() ); 
+        	         const TDesC8& serverContentEncodingStr = fieldServerContentEncodingValStr.DesC();
+        	         if( serverContentEncodingStr == KSmlContentDeflate)
+        	             {
+        	             this->iAgent->iServerContentEncoding = CNSmlHTTP::ExptDeflate;
+        	             }
+    	             }
+    
+    			 RStringF serverAcceptEncoding = strPool.OpenFStringL( KSmlAcceptEncodingType );
+    	         THTTPHdrVal serverAcceptEncodingValue;
+    	         if(hdr.GetField( serverAcceptEncoding, 0, serverAcceptEncodingValue )  != KErrNotFound )	         
+    	             {
+        	         RStringF fieldServerAcceptEncodingValStr = strPool.StringF( serverAcceptEncodingValue.StrF() ); 
+        	         const TDesC8& serverAcceptEncodingStr = fieldServerAcceptEncodingValStr.DesC();
+        	         if( serverAcceptEncodingStr.Find(KSmlContentDeflate) != KErrNotFound)
+        	             {
+        	             this->iAgent->iServerAcceptEncoding = CNSmlHTTP::ExptDeflate;
+        	             }
+    	             }
+			    }
 			
 			if ( status == 200 )
 				{
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/common/sosserver/bld/nsmlsosserver.mmp
--- a/syncmlfw/common/sosserver/bld/nsmlsosserver.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/syncmlfw/common/sosserver/bld/nsmlsosserver.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -31,6 +31,11 @@
 SYSTEMINCLUDE   /epoc32/include/ecom 
 SYSTEMINCLUDE   /epoc32/include/syncml
 SYSTEMINCLUDE   /epoc32/include/connect
+
+SYSTEMINCLUDE		/epoc32/include/mw/hb/hbcore
+SYSTEMINCLUDE		/epoc32/include/mw/hb/hbwidgets
+SYSTEMINCLUDE		/epoc32/include/mw/hb/hbtools
+   
 #ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
 SYSTEMINCLUDE		/epoc32/include/platform/mw/connect
 #endif
@@ -86,6 +91,6 @@
 LIBRARY		policyengine.lib
 LIBRARY		abclient.lib
 LIBRARY     centralrepository.lib //tarm
-LIBRARY                 featmgr.lib
+LIBRARY                 featmgr.lib flogger.lib HbWidgets.lib HbCore.lib
 
 SMPSAFE
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/common/sosserver/inc/PnpLogger.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/syncmlfw/common/sosserver/inc/PnpLogger.h	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,134 @@
+/*
+* Copyright (c) 2004 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  This file defines logging interface macros
+*
+*/
+
+
+#ifndef __LOGGER_H__
+#define __LOGGER_H__
+
+#ifdef _DEBUG
+    #define LOGGING_ENABLED
+#endif
+#ifdef LOGGING_ENABLED          // This must be enabled to use logging system
+
+#define LOGGER_LOGGING          // Log to Logger
+
+
+
+#ifdef LOGGER_LOGGING
+
+//  INCLUDES
+#include <flogger.h>
+
+// LOG SETTINGS 
+_LIT( KPnpLogFolder, "syncml" );
+_LIT( KPnpLogFile, "syncml.TXT" );
+
+#endif
+
+// CONSTANTS  
+// None.
+
+// MACROS
+/*
+-----------------------------------------------------------------------------
+
+    INTERNAL MACROs. 
+
+    DO NOT USE THESE DIRECTLY !!! 
+    SEE EXTERNAL MACROS
+
+-----------------------------------------------------------------------------
+*/
+
+#ifdef LOGGER_LOGGING
+
+#define INTRLOGTEXT( AAA )                                                                        \
+    {                                                                                            \
+    RFileLogger::Write( KPnpLogFolder(), KPnpLogFile(), EFileLoggingModeAppend, AAA );            \
+    }
+#define INTRLOGSTRING( AAA )                                                                    \
+    {                                                                                            \
+    _LIT( tempLogDes, AAA );                                                                    \
+    RFileLogger::Write( KPnpLogFolder(), KPnpLogFile(), EFileLoggingModeAppend, tempLogDes() ); \
+    }
+#define INTRLOGSTRING2( AAA, BBB )                                                                \
+    {                                                                                            \
+    _LIT( tempLogDes, AAA );                                                                    \
+    RFileLogger::WriteFormat( KPnpLogFolder(), KPnpLogFile(), EFileLoggingModeAppend, TRefByValue<const TDesC>( tempLogDes()), BBB ); \
+    }
+#define INTRLOGSTRING3( AAA, BBB, CCC )                                                            \
+    {                                                                                            \
+    _LIT( tempLogDes, AAA );                                                                    \
+    RFileLogger::WriteFormat( KPnpLogFolder(), KPnpLogFile(), EFileLoggingModeAppend, TRefByValue<const TDesC>( tempLogDes()), BBB, CCC ); \
+    }
+#else
+#define INTRLOGTEXT( AAA )
+#define INTRLOGSTRING( AAA )
+#define INTRLOGSTRING2( AAA, BBB )
+#define INTRLOGSTRING3( AAA, BBB, CCC )
+#endif
+
+/*
+-----------------------------------------------------------------------------
+
+    EXTERNAL MACROs
+
+    USE THESE MACROS IN YOUR CODE !
+
+-----------------------------------------------------------------------------
+*/
+
+
+#define LOGTEXT( AAA )                { \
+                                    INTRLOGTEXT( AAA ); \
+                                    }   // Example: LOGTEXT( own_desc );
+
+#define LOGSTRING( AAA )            { \
+                                    INTRLOGSTRING( AAA ); \
+                                    }   // Example: LOGSTRING( "Test" );
+
+#define LOGSTRING2( AAA, BBB )        { \
+                                    INTRLOGSTRING2( AAA, BBB ); \
+                                    }  // Example: LOGSTRING( "Test %i", aValue );
+
+#define LOGSTRING3( AAA, BBB, CCC )    { \
+                                    INTRLOGSTRING3( AAA, BBB, CCC ); \
+                                    } // Example: LOGSTRING( "Test %i %i", aValue1, aValue2 );
+
+
+#else   // LOGGING_ENABLED
+
+#define LOGTEXT( AAA ) 
+#define LOGSTRING( AAA ) 
+#define LOGSTRING2( AAA, BBB )    
+#define LOGSTRING3( AAA, BBB, CCC )    
+
+#endif  // LOGGING_ENABLED
+
+// DATA TYPES
+// None.
+
+// FUNCTION PROTOTYPES
+// None.
+
+// FORWARD DECLARATIONS
+// None.
+
+// CLASS DECLARATION
+// None.
+
+#endif  // __LOGGER_H__
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/common/sosserver/inc/nsmlsosthread.h
--- a/syncmlfw/common/sosserver/inc/nsmlsosthread.h	Tue Feb 02 00:44:00 2010 +0200
+++ b/syncmlfw/common/sosserver/inc/nsmlsosthread.h	Fri Apr 16 15:52:47 2010 +0300
@@ -21,8 +21,11 @@
 
 #include <SyncMLNotifierParams.h>
 #include <SyncMLNotifier.h>
+#include <hbdevicedialogsymbian.h>
+#include <hbsymbianvariant.h>
 #include "nsmlsosserver.h"
 
+
 class CNSmlJob;
 class CNSmlNotifierObserver;
 class CNSmlNotifierTimeOut;
@@ -89,7 +92,7 @@
 		
 		void StartJobSessionL();
 		void CancelJob();
-		TInt VerifyJobFromNotifierL();
+		TInt VerifyJobFromNotifierL(TBool aServerInitiated);
 		
 		TInt FinishedStatus() 
 			{
@@ -182,6 +185,8 @@
 		~CNSmlNotifierObserver();
 		void ConnectToNotifierL( const TSyncMLAppLaunchNotifParams& aParam );
 		void NotifierTimeOut();
+		TBool IsHbSyncmlNotifierEnabledL();
+		void HbNotifierObserverL(const TSyncMLAppLaunchNotifParams& aParam);
 	protected:
 		void DoCancel();
 		void RunL();
@@ -194,6 +199,12 @@
 		CNSmlThreadParams& iThreadParams;
 		CNSmlNotifierTimeOut iNotifierTimeOut;
 		TBool iTimeOut;
+
+		CHbDeviceDialogSymbian* iDevDialog;
+            RProperty iProperty;
+            TBool iHbSyncmlNotifierEnabled;
+		
+
 	};
 	
 
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/common/sosserver/src/nsmlsosthread.cpp
--- a/syncmlfw/common/sosserver/src/nsmlsosthread.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/syncmlfw/common/sosserver/src/nsmlsosthread.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -19,7 +19,7 @@
 #include <DevManInternalCRKeys.h>
 #include <centralrepository.h>
 #include <nsmldebug.h>
-
+#include "PnpLogger.h"
 #include "nsmlsosthread.h"
 #include <DataSyncInternalPSKeys.h>
 
@@ -27,6 +27,26 @@
 #include <centralrepository.h>
 #include "PMUtilInternalCRKeys.h"
 #include <featmgr.h>
+#include <e32property.h>
+#include <DevManInternalCRKeys.h>
+
+
+enum TSyncmlHbNotifierKeys 
+		{
+
+     EHbSOSNotifierKeyStatus = 11, // status set will complete the client subscribe
+     EHbSOSNotifierKeyStatusReturn = 12, // Return the content of actual status value accepted from UI
+     
+     EHbDMSyncNotifierKeyStatus = 13,
+     EHbDMSyncNotifierKeyStatusReturn = 14
+		};
+		
+ TUid sosserverpsuid =
+           {
+           0x101F99FB
+           };
+    	  
+  
 // --------------------------------------------------------------------------
 // EXPORT_C TInt ThreadFunction( TAny* )
 // --------------------------------------------------------------------------
@@ -70,7 +90,7 @@
 			{
 			//if not a silent mode behave as in a normal DM session
 			threadEngine->ForcedCertificateCheckL( EFalse );
-			threadEngine->VerifyJobFromNotifierL();		
+			threadEngine->VerifyJobFromNotifierL(ETrue);		
 			}
 		}
 	else
@@ -446,19 +466,24 @@
 // Launches notifier and waits for 
 // --------------------------------------------------------------------------
 //
-TInt CNSmlThreadEngine::VerifyJobFromNotifierL()
-	{
-	_DBG_FILE("CNSmlThreadEngine::VerifyJobFromNotifierL() : Begin");
-	iNotifierObserver = new (ELeave) CNSmlNotifierObserver(iStatus, iThreadParams);
-	SetActive();
-	
-	TSyncMLAppLaunchNotifParams params;
-	params.iSessionType = ( iThreadParams.iCurrentJob.UsageType() == ESmlDataSync ) ? ESyncMLSyncSession : ESyncMLMgmtSession;
-	params.iJobId = iThreadParams.iCurrentJob.JobId();
-	params.iProfileId = iThreadParams.iCurrentJob.ProfileId();
-    params.iUimode = iThreadParams.iCurrentJob.iUimode;	
-	iNotifierObserver->ConnectToNotifierL( params );
-	_DBG_FILE("CNSmlThreadEngine::VerifyJobFromNotifierL() : End");
+TInt CNSmlThreadEngine::VerifyJobFromNotifierL(TBool aServerInitiated)
+    {
+    LOGSTRING("CNSmlThreadEngine::VerifyJobFromNotifierL()");
+    LOGSTRING("CNSmlThreadEngine::VerifyJobFromNotifierL() : Begin");
+    LOGSTRING2("VerifyJobFromNotifierL before iCallerStatus == iStatus in Threadengine %d", iStatus.Int());
+    iNotifierObserver = new (ELeave) CNSmlNotifierObserver(iStatus,
+            iThreadParams);
+    SetActive();
+    LOGSTRING2("VerifyJobFromNotifierL before iCallerStatus == iStatus in Threadengine %d after setactive", iStatus.Int());
+    TSyncMLAppLaunchNotifParams params;
+    params.iSessionType = (iThreadParams.iCurrentJob.UsageType()
+            == ESmlDataSync) ? ESyncMLSyncSession : ESyncMLMgmtSession;
+    params.iJobId = iThreadParams.iCurrentJob.JobId();
+    params.iProfileId = iThreadParams.iCurrentJob.ProfileId();
+    params.iUimode = iThreadParams.iCurrentJob.iUimode;
+    iNotifierObserver->ConnectToNotifierL(params);
+    LOGSTRING2("iCallerStatus in iNotifierObserver->ConnectToNotifierL( params ); %d", iStatus.Int());
+    LOGSTRING("CNSmlThreadEngine::VerifyJobFromNotifierL() : End");
     return KErrNone;
 	}
 
@@ -757,11 +782,20 @@
 // Constructor
 // --------------------------------------------------------------------------
 //	
-CNSmlNotifierObserver::CNSmlNotifierObserver(TRequestStatus& aStatus, CNSmlThreadParams& aParams)
-: CActive(0), iCallerStatus(aStatus), iThreadParams(aParams)
-	{
-	CActiveScheduler::Add(this);
-	}
+CNSmlNotifierObserver::CNSmlNotifierObserver(TRequestStatus& aStatus,
+        CNSmlThreadParams& aParams) :
+    CActive(0), iCallerStatus(aStatus), iThreadParams(aParams)
+    {
+    LOGSTRING2("iCallerStatus in RunL %d", iCallerStatus.Int());
+    // If the current job is DM job then proceed to use Hb Notifiers
+    
+    if(aParams.iCurrentJob.UsageType() == ESmlDevMan)
+        {    
+        TRAP_IGNORE(iHbSyncmlNotifierEnabled = IsHbSyncmlNotifierEnabledL());
+        }
+    
+    CActiveScheduler::Add(this);
+    }
 
 // --------------------------------------------------------------------------
 // CNSmlNotifierObserver::~CNSmlNotifierObserver()
@@ -769,17 +803,26 @@
 // --------------------------------------------------------------------------
 //	
 CNSmlNotifierObserver::~CNSmlNotifierObserver()
-	{
-	
-	// StartNotifier called to avoid Notifier server panic, if 
-	// notifier does not exist anymore.
-	TBuf8<1> dummy;	
-	iNotifier.StartNotifier(KNullUid, dummy, dummy); // KNullUid should do also..
-	
-	iNotifier.CancelNotifier( KUidNotifier );
-	iNotifier.Close();
-	Cancel();
-	}
+    {
+    LOGSTRING("~CNSmlNotifierObserver");
+    // StartNotifier called to avoid Notifier server panic, if 
+    // notifier does not exist anymore.
+    TBuf8<1> dummy;
+
+    if (!iHbSyncmlNotifierEnabled)
+        {
+        iNotifier.StartNotifier(KNullUid, dummy, dummy); // KNullUid should do also..
+
+        iNotifier.CancelNotifier(KUidNotifier);
+        iNotifier.Close();
+        }
+    else
+        {
+        iProperty.Close();
+        }
+
+    Cancel();
+    }
 
 // --------------------------------------------------------------------------
 // CNSmlNotifierObserver::ConnectToNotifierL( const TSyncMLAppLaunchNotifParams& aParam )
@@ -803,14 +846,28 @@
         {
         iNotifierTimeOut.LaunchNotifierTimer( this );
         }
-        
-    TInt err = iNotifier.Connect();
-    if ( err == KErrNone )
+
+    TInt err = KErrNone;
+
+    if (!iHbSyncmlNotifierEnabled) //Syncml notifier
+        err = iNotifier.Connect();
+
+    if (err == KErrNone)
         {
-        iNotifier.StartNotifierAndGetResponse( iStatus, KUidNotifier, data, iResBuf );                
+        if (!iHbSyncmlNotifierEnabled)
+            {
+            iNotifier.StartNotifierAndGetResponse(iStatus, KUidNotifier,
+                    data, iResBuf);
+            LOGSTRING2( "CNSmlNotifierObserver::ConnectToNotifierL %d after connect, StartNotifierAndGetResponse and after setactive" , iStatus.Int());
+            }
+        else
+            {
+            HbNotifierObserverL(aParam);
+            }
         }
     else
         {
+        LOGSTRING("Stop job error connecting to notifier");
         // Stop job. Error connecting to notifier.
         TRequestStatus* sStatus = &iStatus;
 		User::RequestComplete( sStatus, err );            
@@ -819,20 +876,153 @@
 	}
 
 // --------------------------------------------------------------------------
+// CNSmlNotifierObserver::IsHbNotifierEnabled()
+// Launch Hb Notifier Process
+// --------------------------------------------------------------------------
+//
+TBool CNSmlNotifierObserver::IsHbSyncmlNotifierEnabledL()
+    {
+    CRepository * rep =
+            CRepository::NewLC(KCRUidDeviceManagementInternalKeys);
+
+    TInt notifierenabled = KErrNone;
+
+    TInt err = rep->Get(KDevManEnableHbNotifier, notifierenabled);
+
+    CleanupStack::PopAndDestroy(rep);
+
+    if (err == KErrNone && notifierenabled)
+        {
+        return ETrue;
+        }
+    else
+        {
+        return EFalse;
+        }
+
+    }
+
+// --------------------------------------------------------------------------
+// CNSmlNotifierObserver::HbNotifierObserverL()
+// Launch Hb Notifier Process
+// --------------------------------------------------------------------------
+//
+void CNSmlNotifierObserver::HbNotifierObserverL(const TSyncMLAppLaunchNotifParams& aParam)
+    {
+
+    LOGSTRING2("iCallerStatus before HbNotifierObserverL creation %d", iCallerStatus.Int());
+    
+    _LIT(KHbNotifier,"com.nokia.hb.devicemanagementdialog/1.0");
+    
+    _LIT(KNotifierId, "aasyncmlfw");
+    _LIT(KProfileId, "profileid");
+    _LIT(KUImode, "uimode");
+    _LIT(KServerdisplayname, "serverdisplayname");
+  
+    CHbSymbianVariantMap* varMap = CHbSymbianVariantMap::NewL();
+    CleanupStack::PushL(varMap);
+    
+    HBufC* notifierid = HBufC::NewL(10);
+    CleanupStack::PushL(notifierid);
+    *notifierid =KNotifierId;
+    
+   
+    HBufC* profileid = HBufC::NewL(10);
+    CleanupStack::PushL(profileid);
+    *profileid = KProfileId;
+    
+    HBufC* uimode = HBufC::NewL(10);
+    CleanupStack::PushL(uimode);
+    *uimode = KUImode;
+    
+    HBufC* serverdisplay = HBufC::NewL(20);
+    CleanupStack::PushL(serverdisplay);
+    *serverdisplay = KServerdisplayname;
+        
+    TBuf<256> servername;
+    
+    CNSmlDMSettings* settings = CNSmlDMSettings::NewLC();
+    CNSmlDMProfile* prof = settings->ProfileL(
+            aParam.iProfileId);
+    CleanupStack::PushL(prof);
+    
+    servername = prof->StrValue(EDMProfileDisplayName);
+    
+    CleanupStack::PopAndDestroy(2);
+               
+    TInt id =1000000;
+
+    CHbSymbianVariant* notifieridvar = CHbSymbianVariant::NewL(&id,
+                          CHbSymbianVariant::EInt);
+    
+    
+    CHbSymbianVariant* infoprofileid = CHbSymbianVariant::NewL(&aParam.iProfileId,
+            CHbSymbianVariant::EInt);
+    
+    //CleanupStack::PushL(infoprofileid);
+    
+    CHbSymbianVariant* infouimode = CHbSymbianVariant::NewL(&aParam.iUimode,
+                CHbSymbianVariant::EInt);
+    
+    CHbSymbianVariant* serverdisplayname = CHbSymbianVariant::NewL(&servername,
+                CHbSymbianVariant::EDes);
+    //CleanupStack::PushL(infouimode);
+    
+    varMap->Add(*notifierid, notifieridvar);
+    varMap->Add(*profileid, infoprofileid); // takes ownership
+    varMap->Add(*uimode, infouimode);
+    varMap->Add(*serverdisplay, serverdisplayname);
+
+    /*subscribe key value*/
+    TInt err = RProperty::Define(sosserverpsuid, EHbSOSNotifierKeyStatus, RProperty::EInt);
+    	
+    err = RProperty::Define(sosserverpsuid, EHbSOSNotifierKeyStatusReturn, RProperty::EInt);
+
+    err = iProperty.Attach(sosserverpsuid, EHbSOSNotifierKeyStatus);
+
+    iProperty.Subscribe(iStatus);
+      
+    
+    
+    iDevDialog = CHbDeviceDialogSymbian::NewL();
+    iDevDialog->Show(KHbNotifier, *varMap);
+
+    CleanupStack::PopAndDestroy(5);
+
+   
+
+    LOGSTRING2("CNSmlNotifierObserver hb notifier %d before subscribe", iStatus.Int());
+
+  
+  
+    LOGSTRING2("CNSmlNotifierObserver hb notifier %d after subscribe", iStatus.Int());
+
+    LOGSTRING2("iCallerStatus before HbNotifierObserverL creation %d", iCallerStatus.Int());
+    }
+
+// --------------------------------------------------------------------------
 // CNSmlNotifierObserver::NotifierTimeOut()
 // Starts notifier time out timer
 // --------------------------------------------------------------------------
 //
 void CNSmlNotifierObserver::NotifierTimeOut()
-	{
-	iTimeOut = ETrue;
-	
-	// StartNotifier called to avoid Notifier server panic, if 
-	// notifier does not exist anymore.
-	TBuf8<1> dummy;
-	iNotifier.StartNotifier(KNullUid, dummy, dummy); // KNullUid should do also..
-	iNotifier.CancelNotifier( KUidNotifier );
-	}
+    {
+    LOGSTRING("CNSmlNotifierObserver NotifierTimeOut ");
+    iTimeOut = ETrue;
+
+    // StartNotifier called to avoid Notifier server panic, if 
+    // notifier does not exist anymore.
+    if(!iHbSyncmlNotifierEnabled)
+        {
+        TBuf8<1> dummy;
+        iNotifier.StartNotifier(KNullUid, dummy, dummy); // KNullUid should do also..
+        iNotifier.CancelNotifier( KUidNotifier );
+        }
+    else
+        {
+        iProperty.Close();
+        }
+    }
 
 // --------------------------------------------------------------------------
 // CNSmlNotifierObserver::DoCancel()
@@ -849,8 +1039,29 @@
 // --------------------------------------------------------------------------
 //	
 void CNSmlNotifierObserver::RunL()
-	{
-	    
+    {
+
+    if (iDevDialog && iHbSyncmlNotifierEnabled)
+        {
+
+        
+    TInt status = KErrNone;
+  
+          TInt err  =  RProperty::Get(sosserverpsuid,EHbSOSNotifierKeyStatusReturn , status);
+
+        LOGSTRING2("status is %d", status);
+
+         LOGSTRING2("err of ps key is %d", err);
+
+       if(status == KErrCancel)
+		iStatus = KErrCancel;
+
+        iDevDialog->Cancel();
+        delete iDevDialog;
+        }
+
+    LOGSTRING("CNSmlNotifierObserver RunL start");
+
     TInt ret = iStatus.Int();
     if ( ret == KErrCancel && iTimeOut )
     	{
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/common/sosserver_clientapi/bld/NSmlClientAPI.mmp
--- a/syncmlfw/common/sosserver_clientapi/bld/NSmlClientAPI.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/syncmlfw/common/sosserver_clientapi/bld/NSmlClientAPI.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -65,7 +65,6 @@
 
 MW_LAYER_SYSTEMINCLUDE
 SYSTEMINCLUDE	/epoc32/include/ecom
-SYSTEMINCLUDE	/epoc32/include/http
 SYSTEMINCLUDE	/epoc32/include/libc
 
 LIBRARY         euser.lib estor.lib FeatMgr.lib bafl.lib
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/common/syncagent/bld/NSmlAgentCommon.mmp
--- a/syncmlfw/common/syncagent/bld/NSmlAgentCommon.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/syncmlfw/common/syncagent/bld/NSmlAgentCommon.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -59,7 +59,6 @@
 APP_LAYER_SYSTEMINCLUDE
 SYSTEMINCLUDE	/epoc32/include/libc
 SYSTEMINCLUDE   /epoc32/include/ecom
-SYSTEMINCLUDE   /epoc32/include/http 
 
 LIBRARY         euser.lib     
 LIBRARY         charconv.lib
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/common/transport/bld/nsmltransport.mmp
--- a/syncmlfw/common/transport/bld/nsmltransport.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/syncmlfw/common/transport/bld/nsmltransport.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -42,7 +42,7 @@
 
 MW_LAYER_SYSTEMINCLUDE
 
-SYSTEMINCLUDE		/epoc32/include/libc /epoc32/include/ecom	/epoc32/include/http
+SYSTEMINCLUDE		/epoc32/include/libc /epoc32/include/ecom
 
 USERINCLUDE     ../inc ../../http/inc ../../inc ../../wbxml/inc ../../wbxml/inc/syncml ../../syncagent/inc ../../debug/inc
 USERINCLUDE      ../../obex/obexcommserver/inc ../../obex/obexserverbinding/inc ../../obex/obexclient/inc
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/conf/datasync.confml
Binary file syncmlfw/conf/datasync.confml has changed
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/conf/datasync_2000CF7E.crml
Binary file syncmlfw/conf/datasync_2000CF7E.crml has changed
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/conf/devman.confml
Binary file syncmlfw/conf/devman.confml has changed
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/conf/devman_101F9A0A.crml
Binary file syncmlfw/conf/devman_101F9A0A.crml has changed
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/dm/callbackServer/src/nsmldmcallbackserver.cpp
--- a/syncmlfw/dm/callbackServer/src/nsmldmcallbackserver.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/syncmlfw/dm/callbackServer/src/nsmldmcallbackserver.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -175,7 +175,10 @@
             ) 
 		{
 		_LIT_SECURITY_POLICY_S0 ( mySidPolicy, KNSmlSOSServerSecureID );
-    	mySidPolicy().CheckPolicy ( aMessage );
+    	if(!mySidPolicy().CheckPolicy ( aMessage ))
+    	{
+				User::Leave(KErrAccessDenied);
+			}
 		}
 
 	return CNSmlDmCallbackSession::NewL( (CNSmlDmCallbackServer&)*this ); 
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/dm/dmutils/src/nsmldmtreedtd.cpp
--- a/syncmlfw/dm/dmutils/src/nsmldmtreedtd.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/syncmlfw/dm/dmutils/src/nsmldmtreedtd.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -46,7 +46,7 @@
 // ---------------------------------------------------------------------------
 void CNSmlDmPcdata::FreeContent()
 	{
-    delete iContent;
+    User::Free(iContent);
     iContent = 0;
 	}
 
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/dm/syncagent/bld/nsmldmagent.mmp
--- a/syncmlfw/dm/syncagent/bld/nsmldmagent.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/syncmlfw/dm/syncagent/bld/nsmldmagent.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -56,6 +56,10 @@
 USERINCLUDE     ../../../common/historylog/inc
 SYSTEMINCLUDE   /epoc32/include/ecom
 
+SYSTEMINCLUDE		/epoc32/include/mw/hb/hbcore
+SYSTEMINCLUDE		/epoc32/include/mw/hb/hbwidgets
+SYSTEMINCLUDE		/epoc32/include/mw/hb/hbtools
+
 LIBRARY         euser.lib
 LIBRARY         estor.lib
 LIBRARY         nsmlagentcommon.lib
@@ -72,7 +76,7 @@
 
 //LIBRARY       nsmldmtestmodule.lib
 
-LIBRARY 		policyengine.lib
+LIBRARY 		policyengine.lib HbWidgets.lib HbCore.lib flogger.lib
 
 
 
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/dm/syncagent/inc/NSmlDMCmds.h
--- a/syncmlfw/dm/syncagent/inc/NSmlDMCmds.h	Tue Feb 02 00:44:00 2010 +0200
+++ b/syncmlfw/dm/syncagent/inc/NSmlDMCmds.h	Fri Apr 16 15:52:47 2010 +0300
@@ -171,6 +171,10 @@
 	*/
 	void UpdateErrorStatusCode(SmlItem_t* aItem,TNSmlError::TNSmlSyncMLStatusCode& aStatusCode);
 	
+	
+	TBool IsHbSyncmlNotifierEnabledL();
+	void ServerHbNotifierL(TSyncMLDlgNoteTypes& aNotetype, TDesC& aServerMsg);
+	
 	//
 	private:     // Data
 	struct TDMDevInfo
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/dm/syncagent/inc/OnlineSupportLogger.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/syncmlfw/dm/syncagent/inc/OnlineSupportLogger.h	Fri Apr 16 15:52:47 2010 +0300
@@ -0,0 +1,135 @@
+/*
+* Copyright (c) 2003 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  This file defines logging interface macros
+*
+*/
+
+
+#ifndef __LOGGER_H__
+#define __LOGGER_H__
+
+#ifdef _DEBUG
+    #define LOGGING_ENABLED
+#endif
+#ifdef LOGGING_ENABLED          // This must be enabled to use logging system
+
+#define LOGGER_LOGGING          // Log to Logger
+
+
+
+#ifdef LOGGER_LOGGING
+
+//  INCLUDES
+#include <flogger.h>
+
+// LOG SETTINGS 
+_LIT( KConfManagerLogFolder, "sync" );
+_LIT( KConfManagerLogFile, "Test1.TXT" );
+
+#endif
+
+// CONSTANTS  
+// None.
+
+// MACROS
+/*
+-----------------------------------------------------------------------------
+
+    INTERNAL MACROs. 
+
+    DO NOT USE THESE DIRECTLY !!! 
+    SEE EXTERNAL MACROS
+
+-----------------------------------------------------------------------------
+*/
+
+#ifdef LOGGER_LOGGING
+
+
+#define INTRLOGTEXT( AAA )                                                                                        \
+    {                                                                                                            \
+    RFileLogger::Write( KConfManagerLogFolder(), KConfManagerLogFile(), EFileLoggingModeAppend, AAA );            \
+    }
+#define INTRLOGSTRING( AAA )                                                                                    \
+    {                                                                                                            \
+    _LIT( tempLogDes, AAA );                                                                                    \
+    RFileLogger::Write( KConfManagerLogFolder(), KConfManagerLogFile(), EFileLoggingModeAppend, tempLogDes() );    \
+    }
+#define INTRLOGSTRING2( AAA, BBB )                                                                                \
+    {                                                                                                            \
+    _LIT( tempLogDes, AAA );                                                                                    \
+    RFileLogger::WriteFormat( KConfManagerLogFolder(), KConfManagerLogFile(), EFileLoggingModeAppend, TRefByValue<const TDesC>( tempLogDes()), BBB ); \
+    }
+#define INTRLOGSTRING3( AAA, BBB, CCC )                                                                            \
+    {                                                                                                            \
+    _LIT( tempLogDes, AAA );                                                                                    \
+    RFileLogger::WriteFormat( KConfManagerLogFolder(), KConfManagerLogFile(), EFileLoggingModeAppend, TRefByValue<const TDesC>( tempLogDes()), BBB, CCC ); \
+    }
+#else
+#define INTRLOGTEXT( AAA )
+#define INTRLOGSTRING( AAA )
+#define INTRLOGSTRING2( AAA, BBB )
+#define INTRLOGSTRING3( AAA, BBB, CCC )
+#endif
+
+/*
+-----------------------------------------------------------------------------
+
+    EXTERNAL MACROs
+
+    USE THESE MACROS IN YOUR CODE !
+
+-----------------------------------------------------------------------------
+*/
+
+
+#define LOGTEXT( AAA )                { \
+                                    INTRLOGTEXT( AAA ); \
+                                    }   // Example: LOGTEXT( own_desc );
+
+#define LOGSTRING( AAA )            { \
+                                    INTRLOGSTRING( AAA ); \
+                                    }   // Example: LOGSTRING( "Test" );
+
+#define LOGSTRING2( AAA, BBB )        { \
+                                    INTRLOGSTRING2( AAA, BBB ); \
+                                    }  // Example: LOGSTRING( "Test %i", aValue );
+
+#define LOGSTRING3( AAA, BBB, CCC )    { \
+                                    INTRLOGSTRING3( AAA, BBB, CCC ); \
+                                    } // Example: LOGSTRING( "Test %i %i", aValue1, aValue2 );
+
+
+#else   // LOGGING_ENABLED
+
+#define LOGTEXT( AAA ) 
+#define LOGSTRING( AAA ) 
+#define LOGSTRING2( AAA, BBB )    
+#define LOGSTRING3( AAA, BBB, CCC )    
+
+#endif  // LOGGING_ENABLED
+
+// DATA TYPES
+// None.
+
+// FUNCTION PROTOTYPES
+// None.
+
+// FORWARD DECLARATIONS
+// None.
+
+// CLASS DECLARATION
+// None.
+
+#endif  // __LOGGER_H__
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/dm/syncagent/src/nsmldmagent.cpp
--- a/syncmlfw/dm/syncagent/src/nsmldmagent.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/syncmlfw/dm/syncagent/src/nsmldmagent.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -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 );
@@ -1385,6 +1388,8 @@
 			      return;
 			    }
 			CleanupStack::PushL( profile );
+		  if( iError )
+		  {
            if(iError->SyncLogErrorCode() == KErrNone)
            {
            RWriteStream& LastSyncStream = profile->LastSyncWriteStreamL();
@@ -1410,6 +1415,7 @@
 	        CleanupStack::PopAndDestroy();	
 			}
           } 
+        }
 			CNSmlHistoryArray* array = CNSmlHistoryArray::NewL();
 			CleanupStack::PushL( array );
 			array->SetOwnerShip( ETrue );
@@ -1832,14 +1838,16 @@
 
         for(TInt i =0; i< count ; i++)
             {    
-            CNSmlDMAlertItem* iItem = new (ELeave) CNSmlDMAlertItem ;
-            iItem->iSource = ((*aItemList)[i].iSource)->AllocL();
-            iItem->iTarget = ((*aItemList)[i].iTarget)->AllocL();
-            iItem->iMetaType = ((*aItemList)[i].iMetaType)->AllocL();
-            iItem->iMetaFormat = ((*aItemList)[i].iMetaFormat)->AllocL();
-            iItem->iMetaMark = ((*aItemList)[i].iMetaMark)->AllocL();
-            iItem->iData = ((*aItemList)[i].iData)->AllocL();
-            iDataItem->AppendL(*iItem);
+            CNSmlDMAlertItem* tempItem = new (ELeave) CNSmlDMAlertItem ;
+            CleanupStack::PushL( tempItem );
+            tempItem->iSource = ((*aItemList)[i].iSource)->AllocL();
+            tempItem->iTarget = ((*aItemList)[i].iTarget)->AllocL();
+            tempItem->iMetaType = ((*aItemList)[i].iMetaType)->AllocL();
+            tempItem->iMetaFormat = ((*aItemList)[i].iMetaFormat)->AllocL();
+            tempItem->iMetaMark = ((*aItemList)[i].iMetaMark)->AllocL();
+            tempItem->iData = ((*aItemList)[i].iData)->AllocL();
+            iDataItem->AppendL(*tempItem);
+            CleanupStack::PopAndDestroy( tempItem );
             }
         }   
 
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/dm/syncagent/src/nsmldmcmds.cpp
--- a/syncmlfw/dm/syncagent/src/nsmldmcmds.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/syncmlfw/dm/syncagent/src/nsmldmcmds.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -54,10 +54,13 @@
 #include "smldtd.h"
 #include "smldef.h"
 #include "nsmlagenttestdefines.h"
+#include <hbdevicedialogsymbian.h>
+#include <hbsymbianvariant.h>
 // DM specific includes
 #include "nsmldmagconstants.h"
 #include "NSmlDMCmds.h"
 #include "nsmldmerror.h"
+#include "OnlineSupportLogger.h"
 #ifdef __TEST_TREEMODULE
 #include "nsmldmtestmodule.h"
 #else
@@ -84,6 +87,22 @@
 _LIT8 ( KNSmlDMMetaFormatUserRequest, "chr" );
 _LIT(KChunkName,"AlertItems");
 
+const TUid dmagentuid =
+            {
+            0x101F6DE5
+            };
+
+
+
+enum TSyncmlHbNotifierKeys 
+		{
+
+     EHbSOSNotifierKeyStatus = 11, // status set will complete the client subscribe
+     EHbSOSNotifierKeyStatusReturn = 12, // Return the content of actual status value accepted from UI
+     
+     EHbDMSyncNotifierKeyStatus = 13,
+     EHbDMSyncNotifierKeyStatusReturn = 14
+		};
 
 // ---------------------------------------------------------
 // CNSmlDMCmds::NewL()
@@ -1492,9 +1511,7 @@
         return;
         }
     CleanupStack::PushL(dataBuf16);    
-    RNotifier notifier;
-    User::LeaveIfError( notifier.Connect() );
-    CleanupClosePushL(notifier);
+   
     TPckgBuf<TBool> resBuf;
     if( dataBuf16->Length() > KSyncMLMaxServerMsgLength )
         {
@@ -1509,17 +1526,48 @@
     TRequestStatus status;      
     //Note type to Query note
     notifyParams.iNoteType = ESyncMLYesNoQuery;
-    TPckgBuf<TSyncMLDlgNotifParams> pkgBuf( notifyParams );
-    notifier.StartNotifierAndGetResponse(status,KNSmlSyncDialogUid,pkgBuf,resBuf);
+    TPckgBuf<TSyncMLDlgNotifParams> pkgBuf(notifyParams);
+    
+    
+    if(!IsHbSyncmlNotifierEnabledL())
+    {
+    RNotifier notifier;
+        User::LeaveIfError(notifier.Connect());
+        CleanupClosePushL(notifier);
+    
+    
+    notifier.StartNotifierAndGetResponse(status, KNSmlSyncDialogUid, pkgBuf,
+            resBuf);
     User::WaitForRequest(status);
-    TBool ret = resBuf();
-    if ( status == KErrCancel || status == KErrTimedOut )
+    
+    
+    
+    //TBool ret = resBuf();
+    
+    CleanupStack::PopAndDestroy();
+    }
+    else
+    {
+ 
+    TInt statusval;
+    ServerHbNotifierL(notifyParams.iNoteType, notifyParams.iServerMsg);
+    TInt err = RProperty::Get(dmagentuid, EHbDMSyncNotifierKeyStatusReturn, statusval);
+    	LOGSTRING2("get error status = %d", err);
+    	if(err == KErrNone)
+    		{
+    			status = statusval;
+    			LOGSTRING2("get statusval = %d", status.Int());
+    		}
+ 
+    }
+    
+    if (status == KErrCancel || status == KErrTimedOut)
         {
         TInt error = status == KErrCancel ? TNSmlError::ESmlStatusNotModified : TNSmlError::ESmlStatusRequestTimeout;
         iStatusToServer->SetStatusCodeL( aStatusId, error );
         HandleAlertErrorL();
         }
-    CleanupStack::PopAndDestroy(4); //alertData alertDataWithMDT,databuf16,notifier   
+    CleanupStack::PopAndDestroy(3); //alertData alertDataWithMDT,databuf16,notifier   
     }
 
 // ---------------------------------------------------------
@@ -1670,9 +1718,7 @@
          return;
          }
      CleanupStack::PushL(dataBuf16);    
-     RNotifier notifier;
-     User::LeaveIfError( notifier.Connect() );
-     CleanupClosePushL(notifier);
+    
      TPckgBuf<TBool> resBuf;
      if( dataBuf16->Length() > KSyncMLMaxServerMsgLength )
          {
@@ -1687,11 +1733,139 @@
      TRequestStatus status;              
      notifyParams.iNoteType = ESyncMLInfoNote;
      TPckgBuf<TSyncMLDlgNotifParams> pkgBuf( notifyParams );
-     notifier.StartNotifierAndGetResponse(status,KNSmlSyncDialogUid,pkgBuf,resBuf);
-     User::WaitForRequest(status);
-     CleanupStack::PopAndDestroy(4); //alertData alertDataWithMDT,databuf16,notifier     
-     }
-	
+    if(!IsHbSyncmlNotifierEnabledL())
+        {
+        RNotifier notifier;
+        User::LeaveIfError(notifier.Connect());
+        CleanupClosePushL(notifier);
+        notifier.StartNotifierAndGetResponse(status, KNSmlSyncDialogUid, pkgBuf,
+            resBuf);
+        User::WaitForRequest(status);
+        CleanupStack::PopAndDestroy(); //notifier
+        }
+    else
+        {
+        LOGSTRING("HandleDisplayAlertL Start test 1 start");  
+        ServerHbNotifierL(notifyParams.iNoteType, notifyParams.iServerMsg);
+        LOGSTRING("HandleDisplayAlertL Start test 2 end");
+        }
+    
+    CleanupStack::PopAndDestroy(3); //alertData alertDataWithMDT,databuf16   
+
+
+    }
+
+void CNSmlDMCmds::ServerHbNotifierL(TSyncMLDlgNoteTypes& aNotetype, TDesC& aServerMsg)
+    
+    {
+				LOGSTRING("HandleDisplayAlertL ServerHbNotifier start");  
+				
+        _LIT(KHbNotifier,"com.nokia.hb.devicemanagementdialog/1.0");
+        
+        _LIT(KNotifierId, "syncmlfw");
+        _LIT(KServerpushalertInfo, "serverpushinformative");
+        _LIT(KServerpushalertConfirm, "serverpushconfirmative");
+        
+        TBuf<25> serverpushalertval;
+        
+        if(aNotetype == ESyncMLInfoNote)
+            serverpushalertval.Copy(KServerpushalertInfo);
+        else 
+            serverpushalertval.Copy(KServerpushalertConfirm);
+        
+        CHbDeviceDialogSymbian *devDialog = NULL;
+
+        CHbSymbianVariantMap* varMap = CHbSymbianVariantMap::NewL();
+        CleanupStack::PushL(varMap);
+        
+
+        HBufC* keyBuf = HBufC::NewL(25);
+        CleanupStack::PushL(keyBuf);
+        
+        *keyBuf = KNotifierId;
+        
+        HBufC* servalertmsg = HBufC::NewL(25);
+        CleanupStack::PushL(servalertmsg);
+                
+         *servalertmsg = serverpushalertval;
+         
+         TInt id =0;
+
+         CHbSymbianVariant* notifierid = CHbSymbianVariant::NewL(&id,
+                         CHbSymbianVariant::EInt);
+         
+        
+        CHbSymbianVariant* serveralertmsg = CHbSymbianVariant::NewL(&aServerMsg,
+                CHbSymbianVariant::EDes);
+
+        varMap->Add(*keyBuf,notifierid);
+        varMap->Add(*servalertmsg, serveralertmsg); // takes ownership
+
+        LOGSTRING("HandleDisplayAlertL ServerHbNotifier step 2");
+        
+      
+        RProperty propertykey;
+        
+        TRequestStatus status;
+        
+        TInt err = RProperty::Define(dmagentuid , EHbDMSyncNotifierKeyStatus, RProperty::EInt);
+        	
+        err = RProperty::Define(dmagentuid , EHbDMSyncNotifierKeyStatusReturn, RProperty::EInt);
+
+         TInt err1 = propertykey.Attach(dmagentuid , EHbDMSyncNotifierKeyStatus);
+
+            propertykey.Subscribe(status);
+        
+        LOGSTRING2(" err = %d", err);
+        LOGSTRING2(" err1 = %d", err1);
+        
+        
+         LOGSTRING("HandleDisplayAlertL ServerHbNotifier step 3");
+
+
+        devDialog = CHbDeviceDialogSymbian::NewL();
+        devDialog->Show(KHbNotifier, *varMap);
+
+        User::WaitForRequest(status);
+        
+        propertykey.Close();
+
+
+
+
+        CleanupStack::PopAndDestroy(3);
+        
+
+        if(devDialog)
+            {
+            delete devDialog;
+            devDialog = NULL;
+            }
+        LOGSTRING("HandleDisplayAlertL ServerHbNotifier end");
+
+}
+TBool CNSmlDMCmds::IsHbSyncmlNotifierEnabledL()
+    {
+    CRepository * rep =
+            CRepository::NewLC(KCRUidDeviceManagementInternalKeys);
+
+    TInt notifierenabled = KErrNone;
+
+    TInt err = rep->Get(KDevManEnableHbNotifier, notifierenabled);
+
+    CleanupStack::PopAndDestroy(rep);
+
+    if (err == KErrNone && notifierenabled)
+        {
+        return ETrue;
+        }
+    else
+        {
+        return EFalse;
+        }
+
+    }
+
 // ---------------------------------------------------------
 // CNSmlDMCmds::ProcessSyncL()
 // Process received Add, Replace and Delete commands
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/dm/treedbclient/src/nsmldmtreedbclient.cpp
--- a/syncmlfw/dm/treedbclient/src/nsmldmtreedbclient.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/syncmlfw/dm/treedbclient/src/nsmldmtreedbclient.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -599,7 +599,10 @@
                     if( upperURI.Compare(aURI) != 0 )
                         {
                         iEnforceCheckdone++;
-                        CheckDynamicAclL( upperURI, aCmdType, aMgmtTree );
+                        if(CheckDynamicAclL( upperURI, aCmdType, aMgmtTree ))
+                        	{                        
+                        		_DBG_FILE("RNSmlDMCallbackSession::CheckDynamicAclL() : returns true");
+                        	}
                         }
                     }
                 else
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/dm/treemodule/src/nsmldmddf.cpp
--- a/syncmlfw/dm/treemodule/src/nsmldmddf.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/syncmlfw/dm/treemodule/src/nsmldmddf.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -225,7 +225,7 @@
 			     {
 			     TBool returnstatus = ETrue; 
 			     TPtrC8 Uri1 = NSmlDmURI::URISeg(aURI,1);
-			     if( iAddRootNodesList )//dm case
+			     if( iAddRootNodesList )
 			     {
 			     TPtrC8 FindUri = NSmlDmURI::URISeg(aURI,2);
 			     HBufC8* puri = HBufC8::NewLC(Uri1.Length()+FindUri.Length()+2);
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/dm/treemodule/src/nsmldmmodule.cpp
--- a/syncmlfw/dm/treemodule/src/nsmldmmodule.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/syncmlfw/dm/treemodule/src/nsmldmmodule.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -41,7 +41,7 @@
 // ----------------------------------------------------------------------------
 // CNSmlDmModule::~CNSmlDmModule()
 // ----------------------------------------------------------------------------
-CNSmlDmModule::~CNSmlDmModule()
+EXPORT_C CNSmlDmModule::~CNSmlDmModule()
 	{
 	delete iDDF;
 	delete iCommandBuffer;
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/dm/wappushalert/bld/nsmldmwappushalert.mmp
--- a/syncmlfw/dm/wappushalert/bld/nsmldmwappushalert.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/syncmlfw/dm/wappushalert/bld/nsmldmwappushalert.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -30,7 +30,6 @@
 
 MW_LAYER_SYSTEMINCLUDE
 SYSTEMINCLUDE 	/epoc32/include/ecom
-SYSTEMINCLUDE 	/epoc32/include/push
 #ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
 SYSTEMINCLUDE		/epoc32/include/platform/mw/push
 #endif
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/ds/dsutils/dbcaps/src/NSmlPropParam.cpp
--- a/syncmlfw/ds/dsutils/dbcaps/src/NSmlPropParam.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/syncmlfw/ds/dsutils/dbcaps/src/NSmlPropParam.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -32,7 +32,7 @@
 // CNSmlPropParam::CNSmlPropParam
 // -----------------------------------------------------------------------------
 //
-CNSmlPropParam::CNSmlPropParam( SmlDevInfPropParamPtr_t aParamPtr )
+EXPORT_C CNSmlPropParam::CNSmlPropParam( SmlDevInfPropParamPtr_t aParamPtr )
  : iParamPtr(aParamPtr)
 	{
 	//_DBG_FILE("CNSmlPropParam::CNSmlPropParam(): begin");
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/ds/hostserver/dshostserverbase/bld/nsmldshostserver.mmp
--- a/syncmlfw/ds/hostserver/dshostserverbase/bld/nsmldshostserver.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/syncmlfw/ds/hostserver/dshostserverbase/bld/nsmldshostserver.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -27,6 +27,7 @@
 
 TARGET          nsmldshostserver.dll
 TARGETTYPE      dll
+UID             0x1000008d 0x2002DCFF
 
 #if defined(ARMCC)
 DEFFILE		./def/eabidshostserver
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/ds/hostserver/dshostserverbase/src/Nsmldshostsession.cpp
--- a/syncmlfw/ds/hostserver/dshostserverbase/src/Nsmldshostsession.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/syncmlfw/ds/hostserver/dshostserverbase/src/Nsmldshostsession.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -855,7 +855,7 @@
     	}
     
     CNSmlDSAsyncCallBackForOpen* p = new ( ELeave ) CNSmlDSAsyncCallBackForOpen( 
-    	this, aMessage, OpenFinishedL );
+    	this, aMessage, &CNSmlDSHostSession::OpenFinishedL );
     CleanupStack::PushL( p );
     
     p->iDpi = DataProviderItemL( aMessage.Int0() );
@@ -1024,7 +1024,7 @@
     RArray<TInt>* resultArray = new ( ELeave ) RArray<TInt>;
     CleanupStack::PushL( resultArray );
     CNSmlDSAsyncCallBack* dsao = new ( ELeave ) CNSmlDSAsyncCallBack( 
-    	this, dsi, aMessage, CommitBatchRequestFinishedL, resultArray );
+    	this, dsi, aMessage, &CNSmlDSHostSession::CommitBatchRequestFinishedL, resultArray );
     CleanupStack::Pop( resultArray ); //dsao takes ownership
     
     CleanupStack::PushL( dsao );
@@ -1162,7 +1162,7 @@
     CNSmlServerDSHostItem* dshi = DataStoreItemParamsLC();
     
     CNSmlDSAsyncCallBack* dsao = new ( ELeave ) CNSmlDSAsyncCallBack( 
-    	this, dsi, aMessage, OpenItemRequestFinishedL, dshi );
+    	this, dsi, aMessage, &CNSmlDSHostSession::OpenItemRequestFinishedL, dshi );
     CleanupStack::Pop( dshi ); //dsao takes ownership
     CleanupStack::PushL( dsao );
     
@@ -1244,7 +1244,7 @@
     TNSmlDSDataStoreElement* dsi = DataStoreItemL( aMessage );
     CNSmlServerDSHostItem* dshi = DataStoreItemParamsLC();
     CNSmlDSAsyncCallBack* dsao = new ( ELeave ) CNSmlDSAsyncCallBack( 
-    	this, dsi, aMessage, CreateItemRequestFinishedL, dshi );
+    	this, dsi, aMessage, &CNSmlDSHostSession::CreateItemRequestFinishedL, dshi );
     CleanupStack::Pop( dshi ); //dsao takes ownership
     CleanupStack::PushL( dsao );
     
@@ -1381,7 +1381,7 @@
     TNSmlDSDataStoreElement* dsi = DataStoreItemL( aMessage );
 
     CNSmlDSAsyncCallBack* dsao = new ( ELeave ) CNSmlDSAsyncCallBack( 
-    	this, dsi, aMessage, CommitItemRequestFinishedL );
+    	this, dsi, aMessage, &CNSmlDSHostSession::CommitItemRequestFinishedL );
     CleanupStack::PushL( dsao );
     dsao->CallDSAsyncLC().CommitItemL( dsao->iStatus );
     CleanupStack::Pop(2); //CallDSAsyncLC, dsao
@@ -1622,7 +1622,7 @@
 	TNSmlDSDataStoreElement* dsi = DataStoreItemL( aMessage );
 	
     CNSmlDSChangedItemsFetcher* dsao = CNSmlDSChangedItemsFetcher::NewLC( 
-    	this, dsi, aMessage, AllItemsRequestFinishedL );
+    	this, dsi, aMessage, &CNSmlDSHostSession::AllItemsRequestFinishedL );
     dsao->FetchAllChangedItemsL();
     CleanupStack::Pop(); //dsao
 	}
@@ -1673,7 +1673,7 @@
     CleanupStack::PopAndDestroy(); //readStream
     
     CNSmlDSAsyncCallBack* dsao = new ( ELeave ) CNSmlDSAsyncCallBack( 
-    	this, dsi, aMessage, CommitChangesRequestFinishedL, dius );
+    	this, dsi, aMessage, &CNSmlDSHostSession::CommitChangesRequestFinishedL, dius );
     CleanupStack::Pop( dius ); //dsao takes the ownership.
     CleanupStack::PushL( dsao );
     dsao->CallDSAsyncLC().CommitChangeInfoL( dsao->iStatus, *dius );
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/ds/hostserver/dshostservers/bld/nsmldshostserver1.mmp
--- a/syncmlfw/ds/hostserver/dshostservers/bld/nsmldshostserver1.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/syncmlfw/ds/hostserver/dshostservers/bld/nsmldshostserver1.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -20,7 +20,8 @@
 #include <platform_paths.hrh>
 
 CAPABILITY		ReadUserData WriteUserData // This server has Read / Write capabilities for user data.
-EPOCHEAPSIZE	0x500 0x400000 	// minimum and maximum heap sizes 
+EPOCSTACKSIZE		0x14000
+EPOCHEAPSIZE	0x020000 0x800000 	// minimum and maximum heap sizes 
 VENDORID		VID_DEFAULT
 UID				0 0x101F99FD
 TARGET			nsmldshostserver1.exe
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/ds/hostserver/dshostservers/bld/nsmldshostserver2.mmp
--- a/syncmlfw/ds/hostserver/dshostservers/bld/nsmldshostserver2.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/syncmlfw/ds/hostserver/dshostservers/bld/nsmldshostserver2.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -21,7 +21,8 @@
 
 // This server has read and write capabilities for device and user data
 CAPABILITY		ReadUserData WriteUserData ReadDeviceData WriteDeviceData NetworkServices
-EPOCHEAPSIZE	0x500 0x400000	// minimum and maximum heap sizes
+EPOCSTACKSIZE		0x14000
+EPOCHEAPSIZE	0x020000 0x800000	// minimum and maximum heap sizes
 VENDORID		VID_DEFAULT
 UID				0 0x101F99FE
 TARGET			nsmldshostserver2.exe
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/ds/settings/inc/NSmlProfileContentHandler.h
--- a/syncmlfw/ds/settings/inc/NSmlProfileContentHandler.h	Tue Feb 02 00:44:00 2010 +0200
+++ b/syncmlfw/ds/settings/inc/NSmlProfileContentHandler.h	Fri Apr 16 15:52:47 2010 +0300
@@ -24,7 +24,7 @@
 #include <e32std.h>
 #include <f32file.h>
 #include <eikenv.h> //JIM is this needed ??
-#include "mxmlattributes.h"
+#include "MXMLAttributes.h"
 #include "MXMLContentHandler.h"
 
 #include "nsmldssettings.h"
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/ds/settings/src/NSmlDSSettings.cpp
--- a/syncmlfw/ds/settings/src/NSmlDSSettings.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/syncmlfw/ds/settings/src/NSmlDSSettings.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -119,7 +119,7 @@
 //		Destructor.
 //=============================================
 
-CNSmlDSSettings::~CNSmlDSSettings()
+EXPORT_C CNSmlDSSettings::~CNSmlDSSettings()
 	{
 	if(iResourceProfileArray)
 		{
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/ds/settings/src/pcsuite/NSmlDSProfileRes.rss
--- a/syncmlfw/ds/settings/src/pcsuite/NSmlDSProfileRes.rss	Tue Feb 02 00:44:00 2010 +0200
+++ b/syncmlfw/ds/settings/src/pcsuite/NSmlDSProfileRes.rss	Fri Apr 16 15:52:47 2010 +0300
@@ -117,6 +117,48 @@
 			},
 		PROFILE
 			{
+			profiledisplayname="O3sis";
+			//username="";
+			//password="";
+			serverurl="http://wdev.o3sis.com:80/syncml.osp";
+			serverid="O3SIS SyncML Server";
+			profilehidden=0;
+			transportid=0x101F99F0;
+			deleteallowed=1;
+			visibility="nrhrnnrrhnrnnrnrnn";
+			protocolversion=ESmlVersion1_2;
+			serveralertedaction = ESmlEnableSync;		
+			//httpauthused = 1;
+			//httpauthusername = "UName";
+			//httpauthpassword = "PWord";		
+			contenttypes=
+				{
+				CONTENTTYPE
+					{
+					adapter_implementation_uid = 0x101F6DDD; // Contacts
+					clientdatasource = "C:Contacts.cdb";
+					serverdatasource = "contacts";
+					synctype = ESmlTwoWay;
+					filtervisibility = "h";
+					synctypevisibility = "r";
+					creatorid = 0x101FF968;
+					
+					},
+				CONTENTTYPE
+					{
+					adapter_implementation_uid = 0x101F6DDE; // Calendar
+					clientdatasource = "Calendar";
+					serverdatasource = "calendar";
+					synctype = ESmlTwoWay;
+					filtervisibility = "h";
+					synctypevisibility = "r";
+					creatorid = 0x101FF968;
+					
+					}
+				};
+			},
+		PROFILE
+			{
 			profiledisplayname="PC Suite Data Sync";
 			//username="xxx";
 			//password="xxx";
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/ds/wappushalert/bld/nsmldswappushalert.mmp
--- a/syncmlfw/ds/wappushalert/bld/nsmldswappushalert.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/syncmlfw/ds/wappushalert/bld/nsmldswappushalert.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -26,7 +26,6 @@
 
 MW_LAYER_SYSTEMINCLUDE
 SYSTEMINCLUDE 	/epoc32/include/ecom
-SYSTEMINCLUDE 	/epoc32/include/push
 #ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
 SYSTEMINCLUDE	/epoc32/include/platform/mw/push
 #endif
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/rom/NSmlDMSync.iby
--- a/syncmlfw/rom/NSmlDMSync.iby	Tue Feb 02 00:44:00 2010 +0200
+++ b/syncmlfw/rom/NSmlDMSync.iby	Fri Apr 16 15:52:47 2010 +0300
@@ -38,28 +38,28 @@
 ECOM_PLUGIN(nsmldmstreamingadapter.dll,nsmldmstreamingadapter.rsc)
 #endif
 
-#ifdef FF_DM_BROWSER_ADAPTER
-ECOM_PLUGIN(nsmldmbrowseradapter.dll,nsmldmbrowseradapter.rsc)
-#endif
+REM #ifdef FF_DM_BROWSER_ADAPTER
+REM ECOM_PLUGIN(nsmldmbrowseradapter.dll,nsmldmbrowseradapter.rsc)
+REM #endif
 
-#ifdef __SYNCML_DS //  SyncML data synchronization
-#ifdef __SYNCML_DM_DS //  SyncML device management data sync settings plug-in
-ECOM_PLUGIN(nsmldssettingsadapter.dll,nsmldssettingsadapter.rsc)
-#endif // __SYNCML_DM_DS
-#endif // __SYNCML_DS
+REM #ifdef __SYNCML_DS //  SyncML data synchronization
+REM #ifdef __SYNCML_DM_DS //  SyncML device management data sync settings plug-in
+REM ECOM_PLUGIN(nsmldssettingsadapter.dll,nsmldssettingsadapter.rsc)
+REM #endif // __SYNCML_DM_DS
+REM #endif // __SYNCML_DS
 
-#ifdef __SYNCML_DM_EMAIL //  SyncML device management email settings plug-in
-ECOM_PLUGIN(nsmldmemailadapter.dll,nsmldmemailadapter.rsc)
-#endif // __SYNCML_DM_EMAIL
+REM #ifdef __SYNCML_DM_EMAIL //  SyncML device management email settings plug-in
+REM ECOM_PLUGIN(nsmldmemailadapter.dll,nsmldmemailadapter.rsc)
+REM #endif // __SYNCML_DM_EMAIL
 
-#ifdef __SYNCML_DM_MMS //  SyncML device management MMS settings plug-in
-ECOM_PLUGIN(nsmldmmmsadapter.dll,nsmldmmmsadapter.rsc)
-#endif // __SYNCML_DM_MMS
+REM #ifdef __SYNCML_DM_MMS //  SyncML device management MMS settings plug-in
+REM ECOM_PLUGIN(nsmldmmmsadapter.dll,nsmldmmmsadapter.rsc)
+REM #endif // __SYNCML_DM_MMS
 
-#ifdef __SYNCML_DM_FOTA // SyncML device management Firmware update plug-in
-ECOM_PLUGIN(nsmldmfotaadapter.dll,nsmldmfotaadapter.rsc)
-data=ABI_DIR\BUILD_DIR\z\private\100012a5\policy\101F9A02.SPD		private\100012a5\policy\101F9A02.SPD
-#endif // __SYNCML_DM_FOTA
+REM #ifdef __SYNCML_DM_FOTA // SyncML device management Firmware update plug-in
+REM ECOM_PLUGIN(nsmldmfotaadapter.dll,nsmldmfotaadapter.rsc)
+REM data=ABI_DIR\BUILD_DIR\z\private\100012a5\policy\101F9A02.SPD		private\100012a5\policy\101F9A02.SPD
+REM #endif // __SYNCML_DM_FOTA
 
 
 REM DM utils
@@ -97,24 +97,6 @@
 REM wappushalert
 ECOM_PLUGIN(nsmldmwappushalert.dll,101F6DE3.rsc)
 
-#ifdef FF_DM_CONNMO_ADAPTER 
-// old internet adapter is not used in that case for access point provisioning.
-ECOM_PLUGIN(connmoadapter.dll,connmoadapter.rsc)
-#else
-ECOM_PLUGIN(nsmlinternetadapter.dll,nsmlinternetadapter.rsc)
-#endif FF_DM_CONNMO_ADAPTER
-
-#ifdef __SYNCML_DM_WLAN 
-ECOM_PLUGIN(globalwlanadapter.dll,globalwlanadapter.rsc)
-#endif // __SYNCML_DM_WLAN
-
-#ifdef __ALWAYS_ONLINE_PDPCONTEXT2
-ECOM_PLUGIN( nsmldmalwaysonadapter.dll, nsmldmalwaysonadapter.rsc )
-#endif // __ALWAYS_ONLINE_PDPCONTEXT2
-
-ECOM_PLUGIN( nsmldmbmadapter.dll, nsmldmbmadapter.rsc )
-ECOM_PLUGIN(wlanctrldcmoadapter.dll,wlanctrldcmoadapter.rsc)
-
 #ifdef __SYNCML_DM_OTA
 REM DM OMA provisioning 
 ECOM_PLUGIN(wpdm.dll,wpdm.rsc)
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/rom/NSmlDSSync.iby
--- a/syncmlfw/rom/NSmlDSSync.iby	Tue Feb 02 00:44:00 2010 +0200
+++ b/syncmlfw/rom/NSmlDSSync.iby	Fri Apr 16 15:52:47 2010 +0300
@@ -32,16 +32,16 @@
 
 REM SyncML  Data Synchronisation plug-in adapters
 
-#ifdef  __SYNCML_DS_CAL // SyncML data synchronization calendar plug-in
-ECOM_PLUGIN(nsmlagendadataprovider.dll,nsmlagendadataprovider.rsc)
-data=DATAZ_\RESOURCE_FILES_DIR\NSmlAgendaDataStore_1_1_2.rsc		RESOURCE_FILES_DIR\NSmlAgendaDataStore_1_1_2.rsc
-#endif // __SYNCML_DS_CAL
+REM #ifdef  __SYNCML_DS_CAL // SyncML data synchronization calendar plug-in
+REM ECOM_PLUGIN(nsmlagendadataprovider.dll,nsmlagendadataprovider.rsc)
+REM data=DATAZ_\RESOURCE_FILES_DIR\NSmlAgendaDataStore_1_1_2.rsc		RESOURCE_FILES_DIR\NSmlAgendaDataStore_1_1_2.rsc
+REM #endif // __SYNCML_DS_CAL
 
-#ifdef __SYNCML_DS_CON //  SyncML data synchronization contacts plug-in
-ECOM_PLUGIN(nsmlcontactsdataprovider.dll,nsmlcontactsdataprovider.rsc)
-data=DATAZ_\RESOURCE_FILES_DIR\NSmlContactsDataStoreFormat_1_1_2.rsc	RESOURCE_FILES_DIR\NSmlContactsDataStoreFormat_1_1_2.rsc
-data=DATAZ_\RESOURCE_FILES_DIR\NSmlContactsDataStoreFormat_1_2.rsc	RESOURCE_FILES_DIR\NSmlContactsDataStoreFormat_1_2.rsc
-#endif // __SYNCML_DS_CON
+REM #ifdef __SYNCML_DS_CON //  SyncML data synchronization contacts plug-in
+REM ECOM_PLUGIN(nsmlcontactsdataprovider.dll,nsmlcontactsdataprovider.rsc)
+REM data=DATAZ_\RESOURCE_FILES_DIR\NSmlContactsDataStoreFormat_1_1_2.rsc	RESOURCE_FILES_DIR\NSmlContactsDataStoreFormat_1_1_2.rsc
+REM data=DATAZ_\RESOURCE_FILES_DIR\NSmlContactsDataStoreFormat_1_2.rsc	RESOURCE_FILES_DIR\NSmlContactsDataStoreFormat_1_2.rsc
+REM #endif // __SYNCML_DS_CON
 
 data=DATAZ_\RESOURCE_FILES_DIR\NSmlDSProfileRes.rsc             RESOURCE_FILES_DIR\NSmlDSProfileRes.rsc
 REM \ds\adapters\dataproviderbase
@@ -51,7 +51,7 @@
 file=ABI_DIR\BUILD_DIR\NSmlAdapterLog.dll		SHARED_LIB_DIR\NSmlAdapterLog.dll
 
 REM \ds\datamod
-file=ABI_DIR\BUILD_DIR\nsmldatamod.dll                  SHARED_LIB_DIR\nsmldatamod.dll
+REM file=ABI_DIR\BUILD_DIR\nsmldatamod.dll                  SHARED_LIB_DIR\nsmldatamod.dll
 
 REM \ds\dshostclient
 file=ABI_DIR\BUILD_DIR\NSmldshostclient.dll		SHARED_LIB_DIR\NSmldshostclient.dll
@@ -86,7 +86,7 @@
 REM \ds\dsutils
 file=ABI_DIR\BUILD_DIR\nsmlchangefinder.dll          	SHARED_LIB_DIR\nsmlchangefinder.dll
 file=ABI_DIR\BUILD_DIR\nsmldbcaps.dll                	SHARED_LIB_DIR\nsmldbcaps.dll
-file=ABI_DIR\BUILD_DIR\nsmlCGIScriptParser.dll       	SHARED_LIB_DIR\nsmlCGIScriptParser.dll
+REM file=ABI_DIR\BUILD_DIR\nsmlCGIScriptParser.dll       	SHARED_LIB_DIR\nsmlCGIScriptParser.dll
 file=ABI_DIR\BUILD_DIR\nsmlfilter.dll			SHARED_LIB_DIR\nsmlfilter.dll
 file=ABI_DIR\BUILD_DIR\syncmldatafilter.dll			SHARED_LIB_DIR\syncmldatafilter.dll
 file=ABI_DIR\BUILD_DIR\smlstoreformat.dll		SHARED_LIB_DIR\smlstoreformat.dll
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/syncmlnotifier/eabi/SyncMLNotifieru.def
--- a/syncmlfw/syncmlnotifier/eabi/SyncMLNotifieru.def	Tue Feb 02 00:44:00 2010 +0200
+++ b/syncmlfw/syncmlnotifier/eabi/SyncMLNotifieru.def	Fri Apr 16 15:52:47 2010 +0300
@@ -1,7 +1,4 @@
 EXPORTS
 	_Z13NotifierArrayv @ 1 NONAME
-	_ZTI23CPreSyncPluginInterface @ 2 NONAME ; #<TI>#
-	_ZTV23CPreSyncPluginInterface @ 3 NONAME ; #<VT>#
-	_ZTI17CSyncmlmmcwatcher @ 4 NONAME ; #<TI>#
-	_ZTV17CSyncmlmmcwatcher @ 5 NONAME ; #<VT>#
-
+	_ZTI17CSyncmlmmcwatcher @ 2 NONAME
+	_ZTV17CSyncmlmmcwatcher @ 3 NONAME
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/syncmlnotifier/ecom/SyncMLNotifierWrapper.cpp
--- a/syncmlfw/syncmlnotifier/ecom/SyncMLNotifierWrapper.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/syncmlfw/syncmlnotifier/ecom/SyncMLNotifierWrapper.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -129,7 +129,7 @@
 // NotifierArray
 // Lib main entry point: Creates a notifiers array.
 // -----------------------------------------------------------------------------
-CArrayPtr<MEikSrvNotifierBase2>* NotifierArray()
+EXPORT_C CArrayPtr<MEikSrvNotifierBase2>* NotifierArray()
     {
     FLOG(_L("[SmlNotif]\t NotifierArray()"));
     CArrayPtr<MEikSrvNotifierBase2>* array = 0;
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/syncmlnotifier/group/SyncMLNotifier.mmp
--- a/syncmlfw/syncmlnotifier/group/SyncMLNotifier.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/syncmlfw/syncmlnotifier/group/SyncMLNotifier.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -37,7 +37,7 @@
 SOURCE          SyncMLTimedQueryDialog.cpp
 SOURCE          SyncMLQueryTimer.cpp
 SOURCE          SyncMLQueryDialog.cpp
-SOURCE			SyncMLMessageQueryDialog.cpp SyncMLPreSyncPluginInterface.cpp
+SOURCE			SyncMLMessageQueryDialog.cpp
 SOURCE          SyncMLTimedDateQuery.cpp
 SOURCE          SyncMLTimedInputTextQuery.cpp
 SOURCE          SyncMLTimedNumberQueryDialog.cpp SyncMLAknPopUpList.cpp syncmlmmcwatcher.cpp
@@ -52,7 +52,6 @@
 
 // Default system include paths for app layer modules.
 APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE   /epoc32/include/uikon
 
 LIBRARY euser.lib cone.lib                  // Symbian OS framework libraries
 LIBRARY avkon.lib                           // UI library
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/syncmlnotifier/inc/SyncMLAppLaunchNotifier.h
--- a/syncmlfw/syncmlnotifier/inc/SyncMLAppLaunchNotifier.h	Tue Feb 02 00:44:00 2010 +0200
+++ b/syncmlfw/syncmlnotifier/inc/SyncMLAppLaunchNotifier.h	Fri Apr 16 15:52:47 2010 +0300
@@ -170,8 +170,7 @@
         
         void ReadRepositoryL(TInt aKey, TInt& aValue);
         
-        void ShowRoamingMessageL(TInt keypress, TUint profileId);
-
+        
     private:
 
         /**
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/syncmlnotifier/inc/SyncMLPreSyncPluginInterface.h
--- a/syncmlfw/syncmlnotifier/inc/SyncMLPreSyncPluginInterface.h	Tue Feb 02 00:44:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,138 +0,0 @@
-/*
-* 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: Implementation of syncmlnotifier component
-* 	This is part of syncmlnotifier.
-*
-*/
-
-#ifndef SYNCMLPRESYNCPLUGININTERFACE_H
-#define SYNCMLPRESYNCPLUGININTERFACE_H
-
-// INCLUDE FILES
-#include <s32mem.h>
-#include <coemain.h>
-#include <ecom/ecom.h>
-#include <ecom/implementationinformation.h>
-#include <SyncMLDef.h>
-
-class CPreSyncPlugin;
-
-/**
-* Class is used to instantiate the required plugins when the search has been
-* asked. Acts as interface to all Plugins.
-*/
-
-class CPreSyncPluginInterface: public CBase 
-{
-	public:
-
-		/** 
-		* Symbian OS 2 phased constructor.
-		* @return	A pointer to the created instance of CPreSyncPluginInterface.
-		*/
-		static CPreSyncPluginInterface* NewL();
-
-		/** 
-		* Symbian OS 2 phased constructor.
-		* @return	A pointer to the created instance of CPreSyncPluginInterface.
-		*/
-		static CPreSyncPluginInterface* NewLC();
-
-		/**
-		* Destructor.
-		*/      
-		virtual ~CPreSyncPluginInterface();
-
-		/**
-		* Instantiates the required search plug-ins known by the ecom framework.
-		* basically this function first calls ListAllImplementationsL()
-		* and then checks them one by one to match the algorithm name
-		*/
-		void InstantiatePluginL();
-		
-		CPreSyncPlugin* InstantiateRoamingPluginLC( TSmlProfileId aProfileId );
-
-		/**
-		* Unloads all plugins
-		* This should internally call  REComSession::DestroyedImplementation( iDtor_ID_Key )
-		* and then REComSession::FinalClose()
-		*/
-		void UnloadPlugIns(); 
-
-		/**
-		* Lists all implementations which satisfy this ecom interface
-		*
-		* @param aImplInfoArray On return, contains the list of available implementations
-		* 
-		*/   
-		void ListAllImplementationsL( RImplInfoPtrArray& aImplInfoArray );
-		
-
-		/**
-		* Forwards the request to check if language is supported
-		* to the algorithm instance
-		*/
-		TBool IsDefault();   
-		              
-		/**
-		* Forwards the request to recover data fields order for a URI
-		* to the algorithm instance
-		*/
-		TBool IsProfileYours(TSmlProfileId aProfileId);
-
-		/**
-		* Forwards the request to recover sort order for a URI
-		* to the algorithm instance
-		*/
-		void Handle(TSmlProfileId aProfileId); 
-
-	private: 
-
-		/** 
-		* Performs the first phase of two phase construction.
-		*/
-		CPreSyncPluginInterface();  
-
-		/** 
-		* Symbian OS 2 phased constructor.
-		*/
-		void ConstructL();
-
-		/**
-		* Instantiates a PCS plug-in, knowing the implementation uid.
-		* @param aImpUid imp uID
-		*/
-		CPreSyncPlugin* InstantiatePlugInFromImpUidL( const TUid& aImpUid );
-
-
-	private: 
-
-	    /** iDtor_ID_Key Instance identifier key. When instance of an
-	         *               implementation is created by ECOM framework, the
-	         *               framework will assign UID for it. The UID is used in
-	         *               destructor to notify framework that this instance is
-	         *               being destroyed and resources can be released.
-	         */
-	    TUid iDtor_ID_Key;
-
-		// List of plugins that this interface will interact with
-		RPointerArray<CPreSyncPlugin>  iPluginInstances; 
-
-		// Uid of the algorithm in use
-		TUid iPluginInUse;
-};
-
-#endif // SYNCMLPRESYNCPLUGININTERFACE_H
-
-//End of File
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/syncmlnotifier/src/SyncMLAppLaunchNotifier.cpp
--- a/syncmlfw/syncmlnotifier/src/SyncMLAppLaunchNotifier.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/syncmlfw/syncmlnotifier/src/SyncMLAppLaunchNotifier.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -37,8 +37,7 @@
 #include <aknnotewrappers.h>
 #include <DevManInternalCRKeys.h>
 #include "nsmlconstantdefs.h"
-#include "CPreSyncPlugin.h"
-#include "SyncMLPreSyncPluginInterface.h"
+
 
 // CONSTANTS
 _LIT( KSmlNPanicCategory, "SyncMLNotifier");
@@ -373,52 +372,6 @@
     CleanupStack::PopAndDestroy(rep);
     }
 
-void CSyncMLAppLaunchNotifier::ShowRoamingMessageL(TInt keypress, TUint profileId)
-    {
-    TBool roaming = EFalse;
-    
-    if( (keypress == EAknSoftkeyYes || keypress == EAknSoftkeyOk) &&  (iSmlProtocol == ESyncMLSyncSession) )
-       {
-       TBool bCanSync = ETrue;
-       
-       TInt aValue = 0;
-       ReadRepositoryL(KNSmlDSRoamingFeature, aValue);
-       IsRoamingL(roaming);
-       if(( roaming ) && (aValue == EAspRoamingSettingFeatureEnabled))
-           {                
-              if (iBearerType == EAspBearerInternet)           
-               {
-               CPreSyncPluginInterface* syncPluginInterface = CPreSyncPluginInterface::NewL();
-               CPreSyncPlugin* syncPlugin = 
-                   syncPluginInterface->InstantiateRoamingPluginLC(profileId);
-
-               // Turn lights on and deactivate apps -key
-               TurnLightsOn();  
-               SuppressAppSwitching( ETrue );
-
-               if(syncPlugin->IsSupported())
-                   {
-                   bCanSync = syncPlugin->CanSyncL();
-                   }
-
-               SuppressAppSwitching( EFalse );
-               
-               CleanupStack::PopAndDestroy(syncPlugin);
-               //syncPluginInterface->UnloadPlugIns();
-               delete  syncPluginInterface;   
-
-               if(!bCanSync)
-                   {
-                   iNeedToCompleteMessage=EFalse;
-                   iReplySlot = NULL;
-                   iMessage.Complete( KErrCancel );
-                   return;
-                   }
-                   
-               }                       
-           }            
-       }
-    }
 // -----------------------------------------------------------------------------
 // CSyncMLAppLaunchNotifier::RunL
 // Ask user response and return it to caller.
@@ -532,8 +485,6 @@
 
     CleanupStack::PopAndDestroy( stringholder );
     
-    ShowRoamingMessageL(keypress, param.iProfileId);
-
     if ( iNeedToCompleteMessage ) // Notifier is not cancelled
         {
         	HandleCompleteMessageL(keypress, silent, SanSupport, Timeout, CustomNotes);
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/syncmlnotifier/src/SyncMLDlgNotifier.cpp
--- a/syncmlfw/syncmlnotifier/src/SyncMLDlgNotifier.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/syncmlfw/syncmlnotifier/src/SyncMLDlgNotifier.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -790,7 +790,7 @@
 void CSyncMLDlgNotifier::InputTypeDateL(TInt & result)
 {
 		FLOG( _L("[SmlNotif]\t CSyncMLDlgNotifier::InputTypeDateL() started") ); 
-		TBuf<KSyncMLMaxDefaultResponseMsgLength> InputText(iDR);
+		
 	  TTime date(_L("00010101:"));
     TInt BadData = 1;
     TChar ch = '0';
@@ -840,7 +840,7 @@
 void CSyncMLDlgNotifier::InputTypeTimeL(TInt & result)
 {            	
 		FLOG( _L("[SmlNotif]\t CSyncMLDlgNotifier::InputTypeTimeL() started") );
-		TBuf<KSyncMLMaxDefaultResponseMsgLength> InputText(iDR);
+		
     //create TTime from TBuf iDR
     //hhmmss
     TTime IpTime(_L("120000."));
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/syncmlnotifier/src/SyncMLPreSyncPluginInterface.cpp
--- a/syncmlfw/syncmlnotifier/src/SyncMLPreSyncPluginInterface.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,186 +0,0 @@
-/*
-* 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:  Finds the correct plugin
-*
-*/
-
-
-// INCLUDE FILES
-#include "SyncMLPreSyncPluginInterface.h"
-#include "CPreSyncPlugin.h"
-
-_LIT(kDefault,"DEFAULT");
-
-// ============================== MEMBER FUNCTIONS ============================
-
-// ----------------------------------------------------------------------------
-// CPreSyncPluginInterface::NewL
-// Two Phase Construction
-// ----------------------------------------------------------------------------
-CPreSyncPluginInterface* CPreSyncPluginInterface::NewL()
-{    
-    CPreSyncPluginInterface* self = CPreSyncPluginInterface::NewLC();
-    CleanupStack::Pop( self );
-      
-    return self;
-}
-
-// ----------------------------------------------------------------------------
-// CPreSyncPluginInterface::NewLC
-// Two Phase Construction
-// ---------------------------------------------------------------------------- 
-CPreSyncPluginInterface* CPreSyncPluginInterface::NewLC()
-{   
-    CPreSyncPluginInterface* self = new( ELeave ) CPreSyncPluginInterface();
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    
-    return self;
-}
-
-// ----------------------------------------------------------------------------
-// CPreSyncPluginInterface::CPreSyncPluginInterface
-// Constructor
-// ----------------------------------------------------------------------------    
-CPreSyncPluginInterface::CPreSyncPluginInterface()
-{
-}
-
-// ----------------------------------------------------------------------------
-// CPreSyncPluginInterface::ConstructL
-// 2nd phase constructor
-// ---------------------------------------------------------------------------- 
-void CPreSyncPluginInterface::ConstructL()
-{
-}
-
-// ----------------------------------------------------------------------------
-// CPreSyncPluginInterface::~CPreSyncPluginInterface
-// Constructor
-// ---------------------------------------------------------------------------- 
-CPreSyncPluginInterface::~CPreSyncPluginInterface( ) 
-{
-    UnloadPlugIns();
-    //iPcsPluginInstances.ResetAndDestroy();
-}
-        
-/**
-* Lists all implementations which satisfy this ecom interface
-*
-* @param aImplInfoArray On return, contains the list of available implementations
-* 
-*/   
-inline void CPreSyncPluginInterface::ListAllImplementationsL( RImplInfoPtrArray& aImplInfoArray )
-{
-    REComSession::ListImplementationsL( KPreSyncPluginInterfaceUid, aImplInfoArray );
-}
-        
-// ----------------------------------------------------------------------------
-// CPreSyncPluginInterface::InstantiateAllPlugInsL
-// Instantiates all plugins
-// ----------------------------------------------------------------------------     
-CPreSyncPlugin* CPreSyncPluginInterface::InstantiateRoamingPluginLC( TSmlProfileId aProfileId )
-{
-    RImplInfoPtrArray infoArray;
-    TBool bHandleSync = false;
-    CPreSyncPlugin* syncPlugin = NULL;
-    CPreSyncPlugin* defaultSyncPlugin = NULL;
-
-    // Get list of all implementations
-    TRAPD(error, ListAllImplementationsL( infoArray ));
-    
-    if (error != KErrNone)
-        {
-        return NULL;
-        }
-
-    // Instantiate plugins for all impUIds by calling 
-    // InstantiatePlugInFromImpUidL
-    for ( TInt i=0; i<infoArray.Count(); i++ )
-    {
-        // Get imp info
-        CImplementationInformation& info( *infoArray[i] );
-
-		TUid impUid ( info.ImplementationUid() );	        
-	    
-
-        if ( info.DisplayName().Compare(kDefault) == 0 )
-        {			
-	        //instantiate plugin for impUid
-	        defaultSyncPlugin = InstantiatePlugInFromImpUidL( impUid );
-	        defaultSyncPlugin->SetProfile(aProfileId);
-        }
-		else
-		{
-			syncPlugin = InstantiatePlugInFromImpUidL( impUid );
-			syncPlugin->SetProfile(aProfileId);
-			if(syncPlugin->IsSupported() == true)
-			{
-				bHandleSync = true;
-				break;
-			}
-			else
-			{
-				delete syncPlugin;
-			}
-		}
-    }
-
-    infoArray.ResetAndDestroy();
-	if(bHandleSync == true)
-	{		
-		//delete defaultSyncPlugin;
-	    if(defaultSyncPlugin != NULL)
-	    {
-	    CleanupStack::PopAndDestroy(defaultSyncPlugin);
-	    }
-		return syncPlugin;
-	}
-	else
-	{
-		return defaultSyncPlugin;
-	}    
- }
-
-// -----------------------------------------------------------------------------
-// CPreSyncPluginInterface::UnloadPlugIns
-// Unloads plugins
-// -----------------------------------------------------------------------------
-void CPreSyncPluginInterface::UnloadPlugIns()
-{    
-    REComSession::FinalClose();
-}
-
-// ----------------------------------------------------------------------------
-// CPreSyncPluginInterface::InstantiatePlugInFromImpUidL
-// Instantiates plugin
-// ---------------------------------------------------------------------------- 
-CPreSyncPlugin* CPreSyncPluginInterface::InstantiatePlugInFromImpUidL( const TUid& aImpUid )
-{    
-   // REComSession
-    CPreSyncPlugin *preSyncPlugin= NULL;
-    preSyncPlugin = CPreSyncPlugin::NewL(aImpUid);
-    CleanupStack::PushL(preSyncPlugin);
-    return preSyncPlugin;
-/*
-   TAny* implementation = REComSession::CreateImplementationL ( aImpUid, 
-                _FOFF( CPreSyncPlugin , iDtor_ID_Key) );
-   CPreSyncPlugin* self = REINTERPRET_CAST( CPreSyncPlugin*, implementation );
-   CleanupStack::PushL( self );
-        
-   return self;
-   */
-}
-    
-    
diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/syncmlnotifier/src/SyncMLTimedInputTextQuery.cpp
--- a/syncmlfw/syncmlnotifier/src/SyncMLTimedInputTextQuery.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/syncmlfw/syncmlnotifier/src/SyncMLTimedInputTextQuery.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -155,17 +155,17 @@
 //
 TBool CSyncMLTimedInputTextQuery::HandleQueryEditorStateEventL(CAknQueryControl* aQueryControl, TQueryControlEvent aEventType, TQueryValidationStatus aStatus)
 	{
- 
- 	if( EPhoneLayout == aQueryControl->QueryType() )
- 	 {
-		if (aEventType == EEmergencyCallAttempted)
+ 	if ( aQueryControl )
+  {
+ 		if( EPhoneLayout == aQueryControl->QueryType() )
+ 	 	{
+			if (aEventType == EEmergencyCallAttempted)
         	{
         	TryExitL(EEikBidCancel);
         	}
     	else
         	{
-        	if ( aQueryControl )
-         	{
+        	
          	TBuf<KSyncMLMaxDefaultResponseMsgLength> PhoneNo;
          	aQueryControl->GetText( PhoneNo );
          	TInt posplus = PhoneNo.LocateReverse('+');
@@ -177,10 +177,9 @@
            	{      
           	MakeLeftSoftkeyVisible(EFalse);
            	}
-         	}
-        
-        	}   
+         	}  
   	 }
+  }
  	else //For all other layouts 
  	 {
  	CAknQueryDialog::HandleQueryEditorStateEventL(aQueryControl,aEventType,aStatus);	
diff -r 3f7d9dbe57c8 -r 19fb38abab1d terminalsecurity/SCP/DmEventNotifier/group/DmEventNotifier.mmp
--- a/terminalsecurity/SCP/DmEventNotifier/group/DmEventNotifier.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/terminalsecurity/SCP/DmEventNotifier/group/DmEventNotifier.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -39,7 +39,6 @@
 SOURCE				MMCService.cpp
 
 USERINCLUDE 	. ../inc
-SYSTEMINCLUDE	/epoc32/include/swi
 #ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
 SYSTEMINCLUDE	/epoc32/include/platform/mw/swi
 #endif
@@ -63,5 +62,3 @@
 //Added for SCPEventHandler dll 
 LIBRARY		scpeventhandler.lib
 LIBRARY		flogger.lib
-
-SMPSAFE
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d terminalsecurity/SCP/DmEventNotifier/inc/JavaApplicationService.h
--- a/terminalsecurity/SCP/DmEventNotifier/inc/JavaApplicationService.h	Tue Feb 02 00:44:00 2010 +0200
+++ b/terminalsecurity/SCP/DmEventNotifier/inc/JavaApplicationService.h	Fri Apr 16 15:52:47 2010 +0300
@@ -20,7 +20,9 @@
 // System Includes
 #include <e32base.h>
 #include <e32property.h>    //Publish subscribe key
-#include <javadomainpskeys.h> //Java installer
+//Commented to avoid app layer dependency
+//#include <javadomainpskeys.h> //Java installer
+//Comment ends here
 #include <swispubsubdefs.h> //Java Installer defined here
 #ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
 #include <schinfo.h>
@@ -32,6 +34,9 @@
 //User includes
 #include "DmEventServiceBase.h"
 
+//Constants for java installer - done to avoid app layer dependency
+#define KPSUidJavaLatestInstallation 0x10282567
+
 //The publish subscribe key with condition. Do not alter this unless absolutely needed!
 const TPSKeyCondition KJavaPSKeyCondition(KUidSystemCategory,KPSUidJavaLatestInstallation, 0, TTaskSchedulerCondition::EGreaterThan);
 
diff -r 3f7d9dbe57c8 -r 19fb38abab1d terminalsecurity/SCP/DmEventNotifier/src/DmEventScheduler.cpp
--- a/terminalsecurity/SCP/DmEventNotifier/src/DmEventScheduler.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/terminalsecurity/SCP/DmEventNotifier/src/DmEventScheduler.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -238,6 +238,7 @@
 
     	service->GetServiceIdAndOperation(srvid,opn);
 
+		
     TBool mmcservice (EFalse);
     if (service == iServices[EMmcService])
         {
diff -r 3f7d9dbe57c8 -r 19fb38abab1d terminalsecurity/SCP/SCPClient/group/SCPClient.mmp
--- a/terminalsecurity/SCP/SCPClient/group/SCPClient.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/terminalsecurity/SCP/SCPClient/group/SCPClient.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -67,7 +67,5 @@
 LIBRARY					aknnotify.lib
 LIBRARY 		estor.lib
 
-SMPSAFE
-
 // End of file
 
diff -r 3f7d9dbe57c8 -r 19fb38abab1d terminalsecurity/SCP/SCPClient/src/SCPClient.cpp
--- a/terminalsecurity/SCP/SCPClient/src/SCPClient.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/terminalsecurity/SCP/SCPClient/src/SCPClient.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -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
@@ -1198,46 +1198,36 @@
             TSCPButtonConfig aButtonsShown, TBool aECSSupport, TInt aFlags, TInt& aResFileSCP, TInt& aResFileSecUi) {
     Dprint((_L("[RSCPClient]-> SetSecurityCodeL() >>>")));
     Dprint((_L("[RSCPClient]-> input params - aButtonsShown=%d, aECSSupport=%d"), aButtonsShown, aECSSupport));
-
+    
     if(EFalse == isFlagEnabled) {
         (void)aPassword;
         Dprint((_L("[RSCPClient]-> ERROR: Function not supported in this variant")));
         User :: Invariant();
         return KErrNotSupported;
     }
-
     TInt lRet = LoadResources(aResFileSCP, aResFileSecUi);
-
     if(lRet != KErrNone) {
         return lRet;
     }
-
     TInt lDefCode = 0;
     CRepository* lRepository = CRepository :: NewLC(KCRUidSCPLockCode);
     lRet = lRepository->Get(KSCPLockCodeDefaultLockCode, lDefCode);
-
     if(lRet != KErrNone) {
         Dprint(_L("[RSCPClient]-> ERROR: Unable to perform get on CenRep, lErr=%d"), lRet);
         CleanupStack :: PopAndDestroy(lRepository);
         return lRet;
     }
-
     HBufC* codeHBuf = HBufC :: NewLC(KSCPPasscodeMaxLength + 1);
     HBufC8* addParamsHBuf = HBufC8 :: NewLC(KSCPMaxTARMNotifParamLen);
     TPtr codeBuffer = codeHBuf->Des();
     TPtr8 addParams = addParamsHBuf->Des();
-
     if(lDefCode == 0) {
         Dprint(_L("[RSCPClient]-> INFO: Default lock code has been set already by the user..."));
-
         lRet = RunDialogL(codeBuffer, aButtonsShown, KSCPPasscodeMinLength, KSCPPasscodeMaxLength,
                 R_SECUI_TEXT_ENTER_SEC_CODE, NULL, aECSSupport);
-
         if((lRet) && (lRet != ESecUiEmergencyCall) && (lRet != EAknSoftkeyEmergencyCall)) {
             Dprint(_L("[RSCPClient]-> INFO: User has updated the lock code..."));
-
             lRet = SendReceive( ESCPServAuthenticateS60, TIpcArgs( &codeBuffer, &aPassword, &addParams, aFlags));
-
             Dprint((_L("[RSCPClient]-> INFO: addParams.Length()=%d")), addParams.Length());
             Dprint((_L("[RSCPClient]-> INFO: lRet=%d")), lRet);
         }
@@ -1263,7 +1253,7 @@
 
         HBufC* msgConfirmSave = NULL;
         CAknGlobalConfirmationQuery* query = CAknGlobalConfirmationQuery :: NewLC();
-
+        
         if(aButtonsShown == SCP_OK || aButtonsShown == SCP_OK_ETEL) {
             //msgConfirmSave = CEikonEnv :: Static()->AllocReadResourceLC(R_SET_SEC_CODE);
              msgConfirmSave = CEikonEnv :: Static()->AllocReadResourceLC(R_SET_SEC_CODE_SETTING_QUERY_SERVER);
@@ -1271,31 +1261,31 @@
         }
         else {
             msgConfirmSave = CEikonEnv :: Static()->AllocReadResourceLC(R_SET_SEC_CODE);
-        	query->ShowConfirmationQueryL(statusSave, *msgConfirmSave, R_AVKON_SOFTKEYS_YES_NO__YES, R_QGN_NOTE_QUERY_ANIM);
+        query->ShowConfirmationQueryL(statusSave, *msgConfirmSave, R_AVKON_SOFTKEYS_YES_NO__YES, R_QGN_NOTE_QUERY_ANIM);
         }
-
+        
         User :: WaitForRequest(statusSave);
         CleanupStack :: PopAndDestroy(2); // msgConfirmSave query
 
         if((statusSave == EAknSoftkeyYes) || (statusSave == EAknSoftkeyOk)) {
             Dprint(_L("[RSCPClient]-> INFO: calling GetNewCodeAndChange() ..."));
-
+            
             TBufC<10> NBuf(KSCPDefaultEnchSecCode);
             TPtr codeBuf = NBuf.Des();
-
+            
             TSCPSecCode lNewSecCode;
             TInt lButtonCfg = (aButtonsShown == SCP_OK || aButtonsShown == SCP_OK_ETEL) ? KSCPForcedChange : KSCPNormalChange;
             HBufC* lNewLkCodeBuf = NULL;
             lRet = GetNewCodeAndChange(codeBuf, lButtonCfg, &lNewSecCode, &lNewLkCodeBuf);
-
+            
             Dprint(_L("[RSCPClient]-> INFO: GetNewCodeAndChange() complete, err=%d"), lRet);
-
+            
             if(KErrNone == lRet) {
-                /* This is being called as a workaround for a freezing issue with SecUI. This is in place
+                /* This is being called as a workaround for a freezing issue with SecUI. This is in place 
                  * as a temporary measure until the source is identified.
                 */
                 TInt lTmpRet = SendReceive(ESCPServAuthenticateS60, TIpcArgs(&lNewLkCodeBuf->Des(), &aPassword, &addParams, aFlags));
-
+                
                 Dprint(_L("[RSCPClient]-> INFO: lTmpRet from SendReceive()=%d"), lTmpRet);
                 if(KErrNone == lRet) {
                     Dprint(_L("[RSCPClient]-> INFO: updating CenRep ..."));
@@ -1303,7 +1293,7 @@
                     Dprint(_L("[RSCPClient]-> INFO: User updated lock code for the first time...err= %d"), lRet);
                 }
             }
-
+            
             if(lNewLkCodeBuf) {
                 delete lNewLkCodeBuf;
             }
@@ -1312,56 +1302,52 @@
             Dprint(_L("[RSCPClient]-> INFO: Returning KErrCancel"));
             lRet = KErrCancel;
         }
-
+        
         if(KErrAbort == lRet) {
             Dprint(_L("[RSCPClient]-> INFO: Returning KErrCancel"));
             lRet = KErrCancel;
         }
 
     }
-
+    
     if(addParams.Length() > 0) {
-        CSCPParamObject* tmp = CSCPParamObject :: NewLC();
+        CSCPParamObject* tmp = CSCPParamObject :: NewLC();            
         TInt lTempRet = tmp->Parse(addParams);
-
+        
         if(lTempRet == KErrNone) {
             lTempRet = tmp->Set(KSCPParamPassword, codeBuffer);
         }
-
+        
         if(lTempRet == KErrNone) {
             addParams.Zero();
             HBufC8* tmpBuf;
             lTempRet = tmp->GetBuffer(tmpBuf);
-
+            
             if(lTempRet == KErrNone) {
                 addParams.Copy(tmpBuf->Des());
                 delete tmpBuf;
             }
         }
-
+        
         if(lTempRet == KErrNone) {
             CSCPParamObject* outParams = NULL;
             ProcessServerCommandsL(addParams, &outParams);
-
+            
             if(outParams != NULL) {
                 TSCPSecCode newSecCode;
                 if(outParams->Get(KSCPParamPassword, newSecCode) == KErrNone) {
                     Dprint((_L("[RSCPClient]-> INFO: Updating encoded password received from the server into aPassword...")));
                     aPassword.Copy(newSecCode);
                 }
-
                 delete outParams;
             }
         }
-
         CleanupStack :: PopAndDestroy(tmp);
     }
-
     CleanupStack :: PopAndDestroy(3); // repository, addParamsHBuf, codeHBuf
     Dprint(_L("[RSCPClient]-> SetSecurityCodeL() <<< lRet=%d"), lRet);
     return lRet;
 }
-
 //#endif // __SAP_DEVICE_LOCK_ENHANCEMENTS
 // <<-- *********** Device lock new features *************
 
diff -r 3f7d9dbe57c8 -r 19fb38abab1d terminalsecurity/SCP/SCPClient/src/SCPQueryDialog.cpp
--- a/terminalsecurity/SCP/SCPClient/src/SCPQueryDialog.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/terminalsecurity/SCP/SCPClient/src/SCPQueryDialog.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -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,12 @@
     // we are already on forgeround, need to update priority differently
 	if (var != EPSCTsyCallStateNone)
 	{
+		// If the call is made during device startup have the priority as normal
+		if (iECSSupport && (iButtons == RSCPClient::SCP_OK))
+		{
+		iEikonEnv->RootWin().SetOrdinalPosition(1,ECoeWinPriorityNormal);
+		}
 	
-	iEikonEnv->RootWin().SetOrdinalPosition(1,ECoeWinPriorityNormal);
 	}
     else if ((wgPrio == ECoeWinPriorityAlwaysAtFront)&&(iECSSupport))
         {
@@ -567,7 +571,6 @@
 			if(aType == EEventKey)
 			{
                 HBufC* cbaLabel = NULL;
-				Dprint( (_L("CSCPQueryDialog::OfferKeyEventL(): R_SCPDIALOG_OK_TEXT") ));
                 TRAPD ( err , cbaLabel= StringLoader::LoadL(R_SCPDIALOG_OK_TEXT) );
                 if ( err == KErrNone )
                 {
diff -r 3f7d9dbe57c8 -r 19fb38abab1d terminalsecurity/SCP/SCPDatabase/group/SCPDatabase.mmp
--- a/terminalsecurity/SCP/SCPDatabase/group/SCPDatabase.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/terminalsecurity/SCP/SCPDatabase/group/SCPDatabase.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -44,6 +44,4 @@
 LIBRARY		apgrfx.lib
 LIBRARY		apparc.lib
 
-SMPSAFE
-
 //End of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d terminalsecurity/SCP/SCPDatabase/src/SCPParamDB.cpp
--- a/terminalsecurity/SCP/SCPDatabase/src/SCPParamDB.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/terminalsecurity/SCP/SCPDatabase/src/SCPParamDB.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -177,9 +177,7 @@
 
     __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();
 
@@ -214,9 +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();
@@ -333,7 +330,6 @@
         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();
     }
@@ -419,7 +415,6 @@
 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 3f7d9dbe57c8 -r 19fb38abab1d terminalsecurity/SCP/SCPEventHandler/group/SCPEventHandler.mmp
--- a/terminalsecurity/SCP/SCPEventHandler/group/SCPEventHandler.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/terminalsecurity/SCP/SCPEventHandler/group/SCPEventHandler.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -51,5 +51,4 @@
 LIBRARY 	siscontroller.lib
 //LIBRARY	javaregistryclient.lib
 
-SMPSAFE
 
diff -r 3f7d9dbe57c8 -r 19fb38abab1d terminalsecurity/SCP/SCPHistoryPlugin/group/SCPHistoryPlugin.mmp
--- a/terminalsecurity/SCP/SCPHistoryPlugin/group/SCPHistoryPlugin.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/terminalsecurity/SCP/SCPHistoryPlugin/group/SCPHistoryPlugin.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -68,7 +68,4 @@
 LIBRARY			efsrv.lib			// FileServer
 LIBRARY					flogger.lib
 LIBRARY                 featmgr.lib
-
-SMPSAFE
-
 // End of File
diff -r 3f7d9dbe57c8 -r 19fb38abab1d terminalsecurity/SCP/SCPHistoryPlugin/src/SCPHistoryPlugin.cpp
--- a/terminalsecurity/SCP/SCPHistoryPlugin/src/SCPHistoryPlugin.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/terminalsecurity/SCP/SCPHistoryPlugin/src/SCPHistoryPlugin.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -100,42 +100,6 @@
 	    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 )
         {
diff -r 3f7d9dbe57c8 -r 19fb38abab1d terminalsecurity/SCP/SCPHistoryPlugin/src/SCPSpecificStringsPlugin.cpp
--- a/terminalsecurity/SCP/SCPHistoryPlugin/src/SCPSpecificStringsPlugin.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/terminalsecurity/SCP/SCPHistoryPlugin/src/SCPSpecificStringsPlugin.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -775,10 +775,11 @@
 	Dprint( (_L("CSCPSpecificStringsPlugin::IsNotValidWord()") ));
 	// If so, there is a problem ETrue!!
 	TBool ret;
-	TChar now,previous;		// at hand & prevous char
+	TChar now;// at hand 
+	//TChar previous;		// prevous char
 	ret = EFalse;
 	now = 0;
-	previous = 0;
+	//previous = 0;
 	
 	// Go through the word
 	for (TInt i=0; i < aForbiddenSecurityCodes.Length(); i++)
@@ -789,7 +790,7 @@
 		// And the previous
 		if ( i >= 1 ) 
 		    {
-		    previous = static_cast<TChar>( aForbiddenSecurityCodes[i-1] );
+		   // previous = static_cast<TChar>( aForbiddenSecurityCodes[i-1] );
 		    }
 	
 		// Check for Sapce!
diff -r 3f7d9dbe57c8 -r 19fb38abab1d terminalsecurity/SCP/SCPPatternPlugin/group/SCPPatternPlugin.mmp
--- a/terminalsecurity/SCP/SCPPatternPlugin/group/SCPPatternPlugin.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/terminalsecurity/SCP/SCPPatternPlugin/group/SCPPatternPlugin.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -68,7 +68,4 @@
 LIBRARY			efsrv.lib	// FileServer
 LIBRARY					flogger.lib
 LIBRARY                 featmgr.lib
-
-SMPSAFE
-
 // End of File
diff -r 3f7d9dbe57c8 -r 19fb38abab1d terminalsecurity/SCP/SCPServer/group/SCPServer.mmp
--- a/terminalsecurity/SCP/SCPServer/group/SCPServer.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/terminalsecurity/SCP/SCPServer/group/SCPServer.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -97,9 +97,6 @@
 LIBRARY 	estor.lib
 LIBRARY 	charconv.lib
 LIBRARY		devenccommonutils.lib //Device encryption utility
-
-SMPSAFE
-
 // End of file
 
 
diff -r 3f7d9dbe57c8 -r 19fb38abab1d terminalsecurity/SCP/SCPServer/inc/SCPLockNotificationEventHandler.h
--- a/terminalsecurity/SCP/SCPServer/inc/SCPLockNotificationEventHandler.h	Tue Feb 02 00:44:00 2010 +0200
+++ b/terminalsecurity/SCP/SCPServer/inc/SCPLockNotificationEventHandler.h	Fri Apr 16 15:52:47 2010 +0300
@@ -22,6 +22,7 @@
 #include <bldvariant.hrh>
 #include "SCPLockEventHandler.h"
 
+class CSCPSession;
 // CLASS DECLARATION
 
 /**
@@ -36,18 +37,20 @@
         /**
         * Static constructor.
         */
-   	    static CSCPLockNotificationEventHandler* NewL( CSCPServer* aServer );
+   	    static CSCPLockNotificationEventHandler* NewL( CSCPServer* aServer, CSCPSession* aSession );
         
         /**
         * Static constructor, that leaves the pointer to the cleanup stack.
         */
-        static CSCPLockNotificationEventHandler* NewLC( CSCPServer* aServer );
+        static CSCPLockNotificationEventHandler* NewLC( CSCPServer* aServer, CSCPSession* aSession );
 
         /**
         * Destructor.
         */
         virtual ~CSCPLockNotificationEventHandler();
        
+		// Ack from session after queryadmincmd
+		void AckReceived();
     protected:  // Methods   
         
         // Methods from base classes
@@ -68,12 +71,14 @@
         */
         void DoCancel();
 
+        // send passcode to ISA
+        void VerifyPass();
     private: //Methods
     
         /**
         * C++ default constructor.
         */
-        CSCPLockNotificationEventHandler( CSCPServer* aServer );    
+        CSCPLockNotificationEventHandler( CSCPServer* aServer, CSCPSession* aSession );
 
         /**
         * By default Symbian 2nd phase constructor is private.
@@ -86,13 +91,18 @@
         enum TSCPLNQueryState
             {
             ESCPLNQueryStateNotification,
-            ESCPLNQueryStateVerification
+            ESCPLNQueryStateVerification,
+            ESCPLNQueryStateQueryAdmin
             };
                         
         /** The current processing state. */
         TSCPLNQueryState                        iQueryState;                 
         /** A placeholder for the event received from the TSY */
         RMobilePhone::TMobilePhoneSecurityEvent iEvent;        
+        // Ack from queryadmin
+        TBool iAckReceived;
+        /** The parent session pointer */
+        CSCPSession* iSession;
     };
 
 #endif      // SCPLOCKNOTIFICATIONEVENTHANDLER_H   
diff -r 3f7d9dbe57c8 -r 19fb38abab1d terminalsecurity/SCP/SCPServer/inc/SCPLockSettingEventHandler.h
--- a/terminalsecurity/SCP/SCPServer/inc/SCPLockSettingEventHandler.h	Tue Feb 02 00:44:00 2010 +0200
+++ b/terminalsecurity/SCP/SCPServer/inc/SCPLockSettingEventHandler.h	Fri Apr 16 15:52:47 2010 +0300
@@ -63,14 +63,6 @@
         * Destructor.
         */
         virtual ~CSCPLockSettingEventHandler();
-
-       // New methods  
-       /**
-        * Informs the object that an acknowledgement was received
-        * This method will be used, if the acknowledgement comes in
-        * before the wait is started.
-        */
-        void AckReceived(); 
         
        /**
         * Starts the lock/unlock operation. Must be called for the object
@@ -125,10 +117,6 @@
          TBool iState;
          /** Should Autolock be activated/deactivated on success */
          TBool iAutolock;    
-         /** Is the AO waiting for an acknowledgement to the lock setting call*/
-         TBool iWaitingForAck;
-         /** Has the AO received an acknowledgement already*/
-         TBool iAckReceived;
          /** Has an unlock-message to Autolock been sent*/
          TBool iUnlockSent;
          /** The return status for the message*/
diff -r 3f7d9dbe57c8 -r 19fb38abab1d terminalsecurity/SCP/SCPServer/src/SCPLockNotificationEventHandler.cpp
--- a/terminalsecurity/SCP/SCPServer/src/SCPLockNotificationEventHandler.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/terminalsecurity/SCP/SCPServer/src/SCPLockNotificationEventHandler.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -33,6 +33,7 @@
 
 #include "SCPLockNotificationEventHandler.h"
 #include "SCPServer.h"
+#include "SCPSession.h"
 
 // ================= MEMBER FUNCTIONS =======================
 
@@ -40,10 +41,13 @@
 // might leave.
 //
 CSCPLockNotificationEventHandler::CSCPLockNotificationEventHandler(                        
-            CSCPServer* aServer
+            CSCPServer* aServer,
+            CSCPSession* aSession
             )
 	        : CSCPLockEventHandler( aServer ),
-	        iQueryState(ESCPLNQueryStateNotification) 	
+	        iQueryState(ESCPLNQueryStateNotification),
+	        iSession (aSession),
+	        iAckReceived (EFalse)
     {
     Dprint( (_L("--> CSCPLockNotificationEventHandler::\
 	      CSCPLockNotificationEventHandler()") ));
@@ -68,13 +72,14 @@
 
 // Static constructor.
 CSCPLockNotificationEventHandler* CSCPLockNotificationEventHandler::NewL(
-        CSCPServer* aServer
+        CSCPServer* aServer,
+        CSCPSession* aSession
         )
     {
 	  Dprint( (_L("--> CSCPLockNotificationEventHandler::NewL()") ));
 
 	  CSCPLockNotificationEventHandler* self = 
-	      CSCPLockNotificationEventHandler::NewLC( aServer );
+	      CSCPLockNotificationEventHandler::NewLC( aServer, aSession );
 	        
     CleanupStack::Pop( self );
 	
@@ -85,13 +90,14 @@
 
 // Static constructor, leaves object pointer to the cleanup stack.
 CSCPLockNotificationEventHandler* CSCPLockNotificationEventHandler::NewLC(
-        CSCPServer* aServer 
+        CSCPServer* aServer,
+        CSCPSession* aSession
         )
     {
     Dprint( (_L("--> CSCPLockNotificationEventHandler::NewLC()") ));
 
     CSCPLockNotificationEventHandler* self = 
-        new (ELeave) CSCPLockNotificationEventHandler( aServer );
+        new (ELeave) CSCPLockNotificationEventHandler( aServer, aSession );
 
     CleanupStack::PushL( self );
     self->ConstructL();	
@@ -149,6 +155,48 @@
     }
 
 // ---------------------------------------------------------
+// void CSCPLockNotificationEventHandler::AckReceived()
+// Sets the ackReceived member to indicate that the call has
+// already been acknowledged.
+// 
+// Status : Approved
+// ---------------------------------------------------------
+
+void CSCPLockNotificationEventHandler::AckReceived()
+    {
+    Dprint( (_L("--> CSCPLockNotificationEventHandler::AckReceived()") ));
+    iAckReceived = ETrue;    
+    }
+
+// ---------------------------------------------------------
+// void CSCPLockNotificationEventHandler::VerifyPass()
+// Verify password to the ISA
+// 
+// Status : Approved
+// ---------------------------------------------------------
+void CSCPLockNotificationEventHandler::VerifyPass()
+    {
+    Dprint( (_L("CSCPLockNotificationEventHandler::VerifyPass():\
+        EPhonePasswordRequired event received") ));
+
+    RMobilePhone::TMobilePhoneSecurityCode secCodeType = 
+        RMobilePhone::ESecurityCodePhonePassword;
+        
+    RMobilePhone::TMobilePassword password;
+    RMobilePhone::TMobilePassword required_fourth;
+    required_fourth.Zero();
+    iServer->GetCode( password );                
+
+    iPhone->VerifySecurityCode(iStatus, secCodeType, 
+        password, required_fourth);
+
+    // Start waiting for verification response
+    iQueryState = ESCPLNQueryStateVerification;
+    SetActive(); 
+    Dprint( (_L("<-- CSCPLockNotificationEventHandler::VerifyPass()") ));    
+    }
+
+// ---------------------------------------------------------
 // void CSCPLockNotificationEventHandler::RunL()
 // When the correct security event is received, the code query is
 // verified via VerifySecurityCode. This method also handles the
@@ -166,34 +214,31 @@
         case ( ESCPLNQueryStateNotification ):
             {                        
             // Event received
-            if ( iEvent == RMobilePhone::EPhonePasswordRequired )
-                {
-                Dprint( (_L("CSCPLockNotificationEventHandler::RunL():\
-                    EPhonePasswordRequired event received") ));
-      
-                RMobilePhone::TMobilePhoneSecurityCode secCodeType = 
-                    RMobilePhone::ESecurityCodePhonePassword;
-                    
-                RMobilePhone::TMobilePassword password;
-                RMobilePhone::TMobilePassword required_fourth;
-                required_fourth.Zero();
-                iServer->GetCode( password );                
-      
-                iPhone->VerifySecurityCode(iStatus, secCodeType, 
-                    password, required_fourth);
-      
-                // Start waiting for verification response
-                iQueryState = ESCPLNQueryStateVerification;
-                SetActive();                  
-                }
-            else
-                {
-                Dprint( (_L("CSCPLockNotificationEventHandler::RunL():\
-                    Invalid event received") ));
-                // Re-run registration, this event is not the one we're waiting for
-                RegisterListener();
-                }
-        
+             if (iAckReceived)
+                 {
+                 VerifyPass();
+                 }
+             else if ( iEvent == RMobilePhone::EPhonePasswordRequired )
+                 {
+                 Dprint( (_L("--> CSCPLockNotificationEventHandler::EPhonePasswordRequired") ));
+                 iQueryState = ESCPLNQueryStateQueryAdmin;
+                 iSession->LockOperationPending( ESCPCommandLockPhone, &iStatus );
+                 SetActive();
+                 }
+             else
+                 {
+                 Dprint( (_L("CSCPLockNotificationEventHandler::RunL():\
+                     Invalid event received") ));
+                 // Re-run registration, this event is not the one we're waiting for
+                 RegisterListener();
+                 }
+             break;
+            }
+        // Event received from Session for LockOpPending, queryAdminCmd
+        case (ESCPLNQueryStateQueryAdmin):
+            {             
+            Dprint( (_L("--> CSCPLockNotificationEventHandler::ESCPLNQueryStateQueryAdmin") ));
+            VerifyPass();
             break;
             }
 
diff -r 3f7d9dbe57c8 -r 19fb38abab1d terminalsecurity/SCP/SCPServer/src/SCPLockSettingEventHandler.cpp
--- a/terminalsecurity/SCP/SCPServer/src/SCPLockSettingEventHandler.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/terminalsecurity/SCP/SCPServer/src/SCPLockSettingEventHandler.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -59,8 +59,6 @@
     iSession( aSession ),
     iState( aState ),
     iAutolock( aAutolock ),
-    iWaitingForAck( EFalse ),
-    iAckReceived( EFalse ),
     iUnlockSent( EFalse ),
     iMessageStatus( KErrNone )
 	{
@@ -258,19 +256,6 @@
 
 
 // ---------------------------------------------------------
-// void CSCPLockSettingEventHandler::AckReceived()
-// Sets the ackReceived member to indicate that the call has
-// already been acknowledged.
-// 
-// Status : Approved
-// ---------------------------------------------------------
-
-void CSCPLockSettingEventHandler::AckReceived()
-    {
-    iAckReceived = ETrue;    
-    }
-
-// ---------------------------------------------------------
 // void CSCPLockSettingEventHandler::SetAutolockStateL( TBool aActive )
 // Activates Autolock by signalling the SA/PubSub event, or
 // deactivates it by sending it the deactivation message.
@@ -387,7 +372,7 @@
             iMessageStatus = ret;
             }
         }    
-    else if ( iWaitingForAck ) // Received an acknowledgement for the set lock setting call
+    else // Received an acknowledgement for the set lock setting call
         {
         if ( ret == KErrNone ) 
             {
@@ -402,42 +387,24 @@
             iMessageStatus = ret;
             }            
         }
-    else // SetLockSetting completed
-        {        
-        // Save the status of the lock setting call
-        iMessageStatus = ret;
-
-        Dprint( (_L("CSCPLockSettingEventHandler::RunL():\
-            SetLockSetting returned: %d"), ret ));
-      
-        if ( iAckReceived )
-            {
-            Dprint( (_L("CSCPLockSettingEventHandler::RunL(): Ack already received") ));  
-            startFinalPhase = ETrue;
-            }
-        else
-            {
-            iSession->LockOperationPending( ESCPCommandLockPhone, &iStatus );
-            iWaitingForAck = ETrue;	                
-            finalCall = EFalse;
-	        SetActive(); // Wait for the session-class to complete this call
-            }                	    
-        }
 	   
     if ( ( startFinalPhase ) && ( iAutolock ) )
         {
+        	Dprint( (_L("--> CSCPLockSettingEventHandler::RunL-startFinalPhase") ));
         // Autolock activation/deactivation was requested
         TRAPD( err, SetAutolockStateL( iState ) );
     
         if ( err != KErrNone )
             {
             // If the call failed, send the result as the message status
+            Dprint( (_L("--> CSCPLockSettingEventHandler::RunL-err!=Kerrnone") ));
             iMessageStatus = err;
             }
         else if ( !iState )
             {
             // Inform the session-class that an unlock-message has been sent
             // (the server won't respond to Autolock until the handler finishes)                    
+            Dprint( (_L("--> CSCPLockSettingEventHandler::RunL-!iState") ));                  
             iSession->LockOperationPending( ESCPCommandUnlockPhone, &iStatus );
             iUnlockSent = ETrue;	                
             finalCall = EFalse;
@@ -469,10 +436,7 @@
     {
     Dprint( (_L("--> CSCPLockSettingEventHandler::DoCancel()") ));
 
-    if ( !iWaitingForAck )
-        {
-        iPhone->CancelAsyncRequest( EMobilePhoneSetLockSetting );
-        }        
+    iPhone->CancelAsyncRequest( EMobilePhoneSetLockSetting );
 
     iLockMessage.Complete( KErrCancel );    
     iSession->LockOperationCompleted();  
diff -r 3f7d9dbe57c8 -r 19fb38abab1d terminalsecurity/SCP/SCPServer/src/SCPServer.cpp
--- a/terminalsecurity/SCP/SCPServer/src/SCPServer.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/terminalsecurity/SCP/SCPServer/src/SCPServer.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -635,7 +635,7 @@
         {
         // The configuration has already been checked, exit
         Dprint( (_L("CSCPServer::ValidateConfigurationL(): Configuration is non-default.") ));
-        User::Leave( KErrNone );
+        return;
         }
     else if ( aMode == KSCPInitial )
         {
diff -r 3f7d9dbe57c8 -r 19fb38abab1d terminalsecurity/SCP/SCPServer/src/SCPSession.cpp
--- a/terminalsecurity/SCP/SCPServer/src/SCPSession.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/terminalsecurity/SCP/SCPServer/src/SCPSession.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -181,7 +181,7 @@
                 Dprint( (_L("CSCPSession::AcknowledgeOperation( %d ): \
                     Lock-op acknowledged"), aCommand ));
                 iLockCommandState = ESCPLockCmdStateInProgressAcknowledged;
-                iSettingHandler->AckReceived();
+                iNotificationHandler->AckReceived();
                                 
                 ret = ETrue;
                 break;
@@ -435,7 +435,7 @@
     // (because DOS lock won't be disabled)
     if ( ( aLocked ) || ( ( !IsSMSLockActiveL() ) && ( !IsAutolockActive() ) ) )
         {
-        iNotificationHandler = CSCPLockNotificationEventHandler::NewL( &iServer );
+        iNotificationHandler = CSCPLockNotificationEventHandler::NewL( &iServer, this );
         }
         
 #endif // WINS
@@ -1542,6 +1542,11 @@
             CTC3rdPartyParamsEcomIF* plugin = CTC3rdPartyParamsEcomIF :: NewL(implementation);
             CleanupStack :: PushL(plugin);
             TRAPD(leaveCode, plugin->DeviceLockParamChangedL(aChange));
+            if (!leaveCode)
+            	{
+            	Dprint(_L("[CSCPSession]-> leaveCode=%d"), leaveCode);		
+            	}
+            
             CleanupStack :: PopAndDestroy(); // plugin 
         }
 
@@ -1606,7 +1611,7 @@
 TInt CSCPSession :: HandleSetALPeriodL( const RMessage2& aMessage ) {
     Dprint((_L("[CSCPSession]-> HandleSetParamMessageL() >>>")));
     TBool oldALState = EFalse;
-    TBool lNotifyChange = ETrue;
+    
     #ifndef __WINS__ // No need to check for lock setting changes in emulator
     if ( ( (TSCPParameterID)aMessage.Int0() == ESCPAutolockPeriod ) ||
          ( (TSCPParameterID)aMessage.Int0() == ESCPMaxAutolockPeriod ) )    
@@ -1665,11 +1670,16 @@
 	TInt ret = lChangeArray.Append(lChange);
 	
 	if(KErrNone != ret) {
+		CleanupStack :: PopAndDestroy(); //lChangeArray
 		return;
 	}
 	
 	Dprint(_L("[CSCPSession]->INFO: Initiating notification to all the StakeHolders..."));
 	TRAPD(lErr, NotifyAllStakeHoldersL(lChangeArray, aCallerID));
+	if (!lErr)
+		{
+		Dprint(_L("[CSCPSession]-> lErr=%d"), lErr);
+	}
 	Dprint(_L("[CSCPSession]->INFO: Notification to all the StakeHolders complete..."));
 	CleanupStack :: PopAndDestroy(); //lChangeArray
 }
diff -r 3f7d9dbe57c8 -r 19fb38abab1d terminalsecurity/SCP/SCPTimestampPlugin/group/SCPTimestampPlugin.mmp
--- a/terminalsecurity/SCP/SCPTimestampPlugin/group/SCPTimestampPlugin.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/terminalsecurity/SCP/SCPTimestampPlugin/group/SCPTimestampPlugin.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -73,6 +73,4 @@
 LIBRARY         platformenv.lib 
 #endif
 
-SMPSAFE
-
 // End of File
diff -r 3f7d9dbe57c8 -r 19fb38abab1d terminalsecurity/client/group/TerminalControlClient.mmp
--- a/terminalsecurity/client/group/TerminalControlClient.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/terminalsecurity/client/group/TerminalControlClient.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -38,4 +38,4 @@
 LIBRARY         euser.lib
 LIBRARY       	flogger.lib
 
-SMPSAFE
+
diff -r 3f7d9dbe57c8 -r 19fb38abab1d terminalsecurity/server/group/TerminalControlServer.mmp
--- a/terminalsecurity/server/group/TerminalControlServer.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/terminalsecurity/server/group/TerminalControlServer.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -57,5 +57,3 @@
 LIBRARY       flogger.lib
 LIBRARY                 featmgr.lib
 LIBRARY       devenccommonutils.lib // Device encryption utility
-
-SMPSAFE
\ No newline at end of file
diff -r 3f7d9dbe57c8 -r 19fb38abab1d terminalsecurity/tcadapter/bld/tcadapter.mmp
--- a/terminalsecurity/tcadapter/bld/tcadapter.mmp	Tue Feb 02 00:44:00 2010 +0200
+++ b/terminalsecurity/tcadapter/bld/tcadapter.mmp	Fri Apr 16 15:52:47 2010 +0300
@@ -53,8 +53,6 @@
 LANGUAGE_IDS
 END
 
-SMPSAFE
-
 LIBRARY     		euser.lib
 LIBRARY     		ecom.lib 
 LIBRARY     		efsrv.lib