diff -r d9ec2b8c6bad -r 2fbd1d709fe7 hotspotfw/hsserver/src/hssiapsettingshandler.cpp
--- a/hotspotfw/hsserver/src/hssiapsettingshandler.cpp	Wed Jun 23 19:25:42 2010 +0300
+++ b/hotspotfw/hsserver/src/hssiapsettingshandler.cpp	Tue Jul 06 15:29:22 2010 +0300
@@ -23,10 +23,10 @@
 #include "am_debug.h"
 #include <es_enum.h>
 
-#include <cmconnectionmethodext.h>
+#include <cmconnectionmethod.h>
 #include <cmconnectionmethoddef.h>
-#include <cmdestinationext.h>
-#include <cmmanagerext.h>
+#include <cmdestination.h>
+#include <cmmanager.h>
 
 using namespace CMManager;
 
@@ -82,7 +82,7 @@
     {
     DEBUG("CHssIapSettingsHandler::CreateClientIapL");
 
-    RCmManagerExt cmManager;
+    RCmManager cmManager;
     cmManager.OpenL();
     CleanupClosePushL( cmManager );
     
@@ -91,7 +91,7 @@
     CleanupClosePushL( destinations );
     
     cmManager.AllDestinationsL( destinations );
-    RCmDestinationExt destination;
+    RCmDestination destination;
     // Loop through each destination
     for( TInt i = 0; i < destinations.Count(); i++ )
         {
@@ -101,7 +101,7 @@
         // Internet destination will have ESnapPurposeInternet set in its metadata.
         if (destination.MetadataL(CMManager::ESnapMetadataPurpose) == CMManager::ESnapPurposeInternet)
             {
-            RCmConnectionMethodExt plugin = cmManager.CreateConnectionMethodL( KUidWlanBearerType );
+            RCmConnectionMethod plugin = cmManager.CreateConnectionMethodL( KUidWlanBearerType );
             CleanupClosePushL( plugin );
                 
             plugin.SetStringAttributeL( ECmName, aIapName );
@@ -125,102 +125,6 @@
     }
 
 // -----------------------------------------------------------------------------
-// CreateIapL
-// -----------------------------------------------------------------------------
-//    
-void CHssIapSettingsHandler::CreateIapL()
-    {
-    DEBUG("CHssIapSettingsHandler::CreateIapL");
-
-    RCmManagerExt cmManager;
-    cmManager.OpenL();
-    CleanupClosePushL( cmManager );
-    
-    // Read all destination(SNAP) settings into an array
-    RArray<TUint32> destinations;
-    CleanupClosePushL( destinations );
-    
-    cmManager.AllDestinationsL( destinations );
-    RCmDestinationExt destination;
-    // Loop through each destination
-    for( TInt i = 0; i < destinations.Count(); i++ )
-        {
-        destination = cmManager.DestinationL( destinations[i] );
-        CleanupClosePushL( destination ); 
-        // Internet destination will always exist in the system.
-        // Internet destination will have ESnapPurposeInternet 
-        // set in its metadata.
-        if (destination.MetadataL( CMManager::ESnapMetadataPurpose ) == 
-                                        CMManager::ESnapPurposeInternet )
-            {
-            CWlanMgmtClient* wlanMgmtClient = CWlanMgmtClient::NewL();
-            CleanupStack::PushL( wlanMgmtClient );
-            
-            TWlanConnectionMode connMode;
-            User::LeaveIfError( 
-                    wlanMgmtClient->GetConnectionMode( connMode ) );
-            
-            TWlanConnectionSecurityMode secMode;
-            User::LeaveIfError( 
-                    wlanMgmtClient->GetConnectionSecurityMode( secMode ) );
-                          
-            HBufC* ssid( NULL );
-            TWlanSsid ssidConn;
-            
-            User::LeaveIfError( 
-                    wlanMgmtClient->GetConnectionSsid( ssidConn ) );
-            ssid = HBufC::NewLC( ssidConn.Length() );
-            ssid->Des().Copy( ssidConn ); 
-            
-            TUint32 serviceId(0);
-            TUint32 easyWlanIapId(0);
-            easyWlanIapId = cmManager.EasyWlanIdL();
-                       
-            RCmConnectionMethodExt easyWlanPlugin;
-            easyWlanPlugin = cmManager.ConnectionMethodL( easyWlanIapId );
-            CleanupClosePushL( easyWlanPlugin );
-            TBool scanSsid = easyWlanPlugin.GetBoolAttributeL( EWlanScanSSID );
-            TUint32 easyWlanServiceId = 
-                    easyWlanPlugin.GetIntAttributeL( EWlanServiceId );
-            CleanupStack::PopAndDestroy(); // easyWlanPlugin;
-            
-            RCmConnectionMethodExt plugin =
-                cmManager.CreateConnectionMethodL( KUidWlanBearerType );
-            CleanupClosePushL( plugin );        
-            plugin.SetStringAttributeL( ECmName, *ssid );
-            plugin.SetStringAttributeL( EWlanSSID, *ssid );
-            plugin.SetIntAttributeL( CMManager::EWlanSecurityMode,
-                    ConvertConnectionSecurityModeToSecModeL( secMode ));
-            plugin.SetIntAttributeL( EWlanConnectionMode, 
-                    ConvertConnectionModeToNetModeL( connMode ) );
-            plugin.SetBoolAttributeL( EWlanScanSSID, scanSsid );
-            destination.AddConnectionMethodL( plugin );
-            destination.UpdateL();
-            serviceId = plugin.GetIntAttributeL( EWlanServiceId );                
-           
-            CleanupStack::PopAndDestroy( &plugin ); 
-            if ( secMode == EWlanConnectionSecurityWep )
-                {
-                SaveWEPKeyL( easyWlanServiceId, serviceId );
-                }
-                    
-            if ( secMode == EWlanConnectionSecurityWpaPsk )
-                {
-                SaveWPAKeyL( easyWlanServiceId, serviceId );
-                }
-            
-            CleanupStack::PopAndDestroy( ssid ); 
-            CleanupStack::PopAndDestroy( wlanMgmtClient );
-            }
-        CleanupStack::PopAndDestroy( &destination ); 
-        }
-    CleanupStack::PopAndDestroy( &destinations ); 
-    CleanupStack::PopAndDestroy( &cmManager );
-
-    DEBUG("CHssIapSettingsHandler::CreateIapL Done");
-    }
-
-// -----------------------------------------------------------------------------
 // DeleteIapL
 // -----------------------------------------------------------------------------
 //
@@ -228,11 +132,11 @@
     {
     DEBUG1("CHssIapSettingsHandler:::DeleteIapL aIapId=%d ", aIapId);
 
-    RCmManagerExt cmManager;
+    RCmManager cmManager;
     cmManager.OpenL();
     CleanupClosePushL( cmManager );
 
-    RCmConnectionMethodExt plugin = cmManager.ConnectionMethodL( aIapId );
+    RCmConnectionMethod plugin = cmManager.ConnectionMethodL( aIapId );
     CleanupClosePushL( plugin );
 
     cmManager.RemoveAllReferencesL( plugin );
@@ -310,16 +214,12 @@
     wlanRecordNew->ModifyL( *dbSession );        
     CleanupStack::PopAndDestroy( wlanRecordNew );
     
-    dbSession->CommitTransactionL();
-    
-    dbSession->Close();
-    CleanupStack::PopAndDestroy( dbSession );
-    
     CleanupStack::Pop( 1 ); // transaction rollback popped
         
     dbSession->CommitTransactionL();
-   
-    
+
+    dbSession->Close();
+    CleanupStack::PopAndDestroy( dbSession );
     DEBUG("CHssIapSettingsHandler::SaveWEPKey Done");
     }