--- a/syncmlfw/ds/provisioningadapter/src/NSmlDsProvisioningAdapter.cpp	Tue Aug 31 16:04:06 2010 +0300
+++ b/syncmlfw/ds/provisioningadapter/src/NSmlDsProvisioningAdapter.cpp	Wed Sep 01 12:27:42 2010 +0100
@@ -26,11 +26,11 @@
 #include <barsread.h>
 #include <NSmlDSProvisioningAdapter.rsg>
 #include <bautils.h>
+#include <ApUtils.h>
 #include <barsc.h>
-#include <cmconnectionmethoddef.h>
-#include <cmmanagerext.h>
 #include <centralrepository.h> //For central Repository
-#include <nsmloperatordatacrkeys.h> // KCRUidOperatorDatasyncInternalKeys
+#include <NsmlOperatorDataCRKeys.h> // KCRUidOperatorDatasyncInternalKeys
+
 #include <nsmlconstants.h>
 #include <nsmldebug.h>
 #include <nsmldsconstants.h>
@@ -267,15 +267,12 @@
             {
             uid.Copy(iProfiles[aItem]->iVisitParameter->Data() );
 
-            RCmManagerExt  cmmanagerExt;
-		    cmmanagerExt.OpenL();
-		    CleanupClosePushL(cmmanagerExt);
-		    RCmConnectionMethodExt cm;
-		    cm = cmmanagerExt.ConnectionMethodL( uid());
-		    CleanupClosePushL( cm );
+            CCommsDatabase* commDb = CCommsDatabase::NewL();
+            CleanupStack::PushL(commDb);
+            CApUtils* aputils = CApUtils::NewLC( *commDb);
 
-            TRAP( ERROR, apId = cm.GetIntAttributeL(CMManager::ECmIapId) );
-            CleanupStack::PopAndDestroy(2); //cmmanager,cm
+            TRAP( ERROR, apId = aputils->IapIdFromWapIdL( uid() ) );
+            CleanupStack::PopAndDestroy(2); //commdb, aputils
             }
 
         //Get default access point in failure of getting AP
@@ -298,13 +295,15 @@
 		// see if address contains also port
 		TBool portFound = EFalse;
 		TInt startPos(0);
+		TBool isHTTPS = EFalse;
 		if(iProfiles[aItem]->iHostAddress->Find(KNSmlDsProvisioningHTTP)==0)
 		    {
 		    startPos=KNSmlDsProvisioningHTTP().Length();		    		    
 		    }
 		else if(iProfiles[aItem]->iHostAddress->Find(KNSmlDsProvisioningHTTPS)==0)
 		    {
-		    startPos=KNSmlDsProvisioningHTTPS().Length();		    		    
+		    startPos=KNSmlDsProvisioningHTTPS().Length();	
+		    isHTTPS = ETrue;
 		    }
 		TPtrC uriPtr = iProfiles[aItem]->iHostAddress->Mid(startPos);
 		
@@ -335,9 +334,18 @@
 				}
 			else
 				{
+				TBuf<16> portNum;
+				if (isHTTPS)
+				    {
+				    portNum.Copy(KNSmlDsHTTPSDefaultPort());
+				    }
+				else
+				    {
+				    portNum.Copy(KNSmlDsDefaultPort());
+				    }
 				// use default port
 				if( CombineURILC( iProfiles[aItem]->iHostAddress->Des(),
-							  KNSmlDsDefaultPort(), uri ) == KErrNone )
+				        portNum, uri ) == KErrNone )
 					{
 					if(iProfiles[aItem]->iHostAddress)
 					{