--- a/omaprovisioning/provisioning/WAPAdapter/Src/CWPWAPAdapterBase.cpp	Fri Apr 16 15:52:47 2010 +0300
+++ b/omaprovisioning/provisioning/WAPAdapter/Src/CWPWAPAdapterBase.cpp	Mon May 03 13:19:46 2010 +0300
@@ -20,7 +20,8 @@
 // INCLUDE FILES
 #include <e32base.h>
 #include <commdb.h>
-#include <ApDataHandler.h>
+#include <cmmanagerext.h>
+#include <cmconnectionmethodext.h>
 #include <CWPAdapter.h>
 #include <CWPCharacteristic.h>
 #include <CWPParameter.h>
@@ -57,7 +58,12 @@
     iItems.ResetAndDestroy();
     iHiddenItems.ResetAndDestroy();
     delete iCommsDb;
-    delete iAPHandler;
+    
+    if ( iCmManager !=  NULL )
+        {
+        iCmManager->Close();
+        delete iCmManager;
+        }
     }
 
 // -----------------------------------------------------------------------------
@@ -200,7 +206,7 @@
     if( pckg().iSaveItemType == KWPWAPItemTypeAccesspoint )
         {
         DVA( "DeleteL: Deleting access point %08x", pckg().iUID );
-        TRAPD( err, iAPHandler->RemoveAPL( pckg().iUID ) );
+        TRAPD( err, iCmManager->ConnectionMethodL( pckg().iUID).DeleteL());
         DVA( "DeleteL: Deleted, %d", err );
         
         switch( err )
@@ -246,12 +252,10 @@
         {
         iCommsDb = CCommsDatabase::NewL();
         }
+    iCmManager = new RCmManagerExt;
+    iCmManager->OpenL();
 
-    if( !iAPHandler )
-        {
-        iAPHandler = CApDataHandler::NewLC( *iCommsDb );
-        CleanupStack::Pop(); // iAPEngine
-        }
+    
     }
 
 //  End of File