# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1274784800 -10800 # Node ID 32ab7ae9ec940baac8a3b5422fde0207df03b981 # Parent 9e96e2676219cf6b5ae98c8553e692bfb077e48b Revision: 201019 Kit: 2010121 diff -r 9e96e2676219 -r 32ab7ae9ec94 webservices/wscore/src/senclientsession.cpp --- a/webservices/wscore/src/senclientsession.cpp Tue May 11 17:14:12 2010 +0300 +++ b/webservices/wscore/src/senclientsession.cpp Tue May 25 13:53:20 2010 +0300 @@ -1508,7 +1508,7 @@ const TDesC8& aRequest, CSenAtomEntry& aAtomEntry) { - CSLOG_L(iConnectionID, KMinLogLevel ,"CSenClientSession::ParseMessageL"); + CSLOG_L(iConnectionID, KMinLogLevel ,"CSenClientSession::ParseMessageL(aTransactionId, aRequest, aAtomEntry)"); CSenParser* pParser = CSenParser::NewLC(); pParser->EnableFeature(EReportNamespaceMapping); pParser->ParseL(aRequest, aAtomEntry); @@ -1559,13 +1559,14 @@ } CleanupStack::PopAndDestroy(pParser); + CSLOG_L(iConnectionID, KMinLogLevel ,"CSenClientSession::ParseMessageL(aTransactionId, aRequest, aAtomEntry) Completed"); return KErrNone; } TInt CSenClientSession::ParseMessageL(TInt aTransactionId, const TDesC8& aRequest, CSenSoapEnvelope2& aSoapEnvelope) { - CSLOG_L(iConnectionID, KMinLogLevel , "CSenClientSession::ParseMessageL"); + CSLOG_L(iConnectionID, KMinLogLevel , "CSenClientSession::ParseMessageL(aTransactionId, aRequest, aSoapEnvelope)"); CSenParser* pParser = CSenParser::NewLC(); pParser->EnableFeature(EReportNamespaceMapping); pParser->ParseL(aRequest, aSoapEnvelope); @@ -1659,7 +1660,7 @@ } } CleanupStack::PopAndDestroy(pParser); - + CSLOG_L(iConnectionID, KMinLogLevel , "CSenClientSession::ParseMessageL(aTransactionId, aRequest, aSoapEnvelope) Completed"); return retVal; } @@ -1951,7 +1952,7 @@ CleanupStack::PushL( pErrorMsg ); } aSenChunk.ChunkHeader().SetContextId(transactionId); // temporary - CSLOG_FORMAT((iConnectionID, KNormalLogLevel , _L8("SendMsgL - SetContextId: %d"), transactionId)); + CSLOG_FORMAT((iConnectionID, KMinLogLevel , _L8("SendMsgL - SetContextId: %d"), transactionId)); } else { @@ -3747,6 +3748,7 @@ } void CSenClientSession::AddCredentialL( const RMessage2& aMessage ) { + CSLOG(iConnectionID, KMinLogLevel ,(_L("CSenClientSession::AddCredentialL()"))); TInt retVal(KErrNone); CSenChunk* pSenChunk = NULL; @@ -3859,14 +3861,27 @@ iManager.AddCredentialL(pIdP, pCredential, retVal); RWSDescriptionArray aMatches; - iManager.ServiceDescriptionsL(aMatches,*pSD); - CleanupClosePushL(aMatches); - - for(TInt i = 0; i < aMatches.Count(); i++) - { - ((CSenWebServiceSession*)aMatches[i])->AddCredentialObserverL(*pCredential); - } - + iManager.ServiceDescriptionsL(aMatches,*pSD); + CleanupClosePushL(aMatches); + + for(TInt i = 0; i < aMatches.Count(); i++) + { + if(((CSenWebServiceSession*)aMatches[i]) && pCredential) + { + CSLOG_FORMAT((iConnectionID, KMinLogLevel , _L8("SD Type is = %d"), aMatches[i]->DescriptionClassType())); + if( aMatches[i]->HasSuperClass( MSenServiceDescription::EServiceSession ) ) + { + CSLOG(iConnectionID, KMinLogLevel ,(_L("CSenClientSession::AddCredentialL() - Calling AddCredentialObserverL()"))); + ((CSenWebServiceSession*)aMatches[i])->AddCredentialObserverL(*pCredential); + CSLOG(iConnectionID, KMinLogLevel ,(_L("CSenClientSession::AddCredentialL() - Completed AddCredentialObserverL()"))); + } + else + { + CSLOG(iConnectionID, KMinLogLevel ,(_L("CSenClientSession::AddCredentialL() - SD is not the session object !!! "))); + } + } + } + CleanupStack::PopAndDestroy(&aMatches); CleanupStack::Pop(pCredential); @@ -3881,6 +3896,7 @@ CleanupStack::PopAndDestroy(pSenChunk); aMessage.Complete(retVal); + CSLOG(iConnectionID, KMinLogLevel ,(_L("CSenClientSession::AddCredentialL() Completed"))); } void CSenClientSession::CredentialsL( const RMessage2& aMessage ) diff -r 9e96e2676219 -r 32ab7ae9ec94 webservices/wscore/src/senxmldao.cpp --- a/webservices/wscore/src/senxmldao.cpp Tue May 11 17:14:12 2010 +0300 +++ b/webservices/wscore/src/senxmldao.cpp Tue May 25 13:53:20 2010 +0300 @@ -1253,7 +1253,7 @@ } } } - TLSLOG_FORMAT((KSenCoreServiceManagerLogChannelBase , KNormalLogLevel, _L8(" - total of %d matches found."), + TLSLOG_FORMAT((KSenCoreServiceManagerLogChannelBase , KMinLogLevel, _L8(" - total of %d matches found."), aMatches.Count())); return retVal; // last error from Append() is returned atm @@ -1604,7 +1604,7 @@ // This method needs to be wrapped inside critical section // NOTE: do *NOT* file log before this line(!): - TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KMaxLogLevel,"CSenXMLDAO::LookupHostletForL:"); + TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,"CSenXMLDAO::LookupHostletForL:"); TLSLOG(KSenCoreServiceManagerLogChannelBase , KMaxLogLevel,(aReqThreadId)); TLSLOG(KSenCoreServiceManagerLogChannelBase , KMaxLogLevel,(aReqConsumerId)); @@ -1624,7 +1624,7 @@ { if(pHostlet->Endpoint()==aHostletEndpoint) { - TLSLOG_FORMAT((KSenCoreServiceManagerLogChannelBase , KMaxLogLevel, _L8("- Matching sharable hostlet found from cache: 0x%X"), &pHostlet)); + TLSLOG_FORMAT((KSenCoreServiceManagerLogChannelBase , KMinLogLevel, _L8("- Matching sharable hostlet found from cache: 0x%X"), &pHostlet)); return *pHostlet; } } @@ -1652,11 +1652,11 @@ // Next line is critical; when count goes to zero, // provider can be de-allocated from memory! pLookupInfo->IncrementLookupCount(); - TLSLOG_FORMAT((KSenCoreServiceManagerLogChannelBase , KMaxLogLevel, _L8("- A non-threadsafe, unsharable local provider (hostlet) was found: 0x%X - lookup info: 0x%X, lookup count: %d"), pHostlet, pLookupInfo, pLookupInfo->LookupCount())); + TLSLOG_FORMAT((KSenCoreServiceManagerLogChannelBase , KMinLogLevel, _L8("- A non-threadsafe, unsharable local provider (hostlet) was found: 0x%X - lookup info: 0x%X, lookup count: %d"), pHostlet, pLookupInfo, pLookupInfo->LookupCount())); if(pHostlet->Reinitializable()) { pHostlet->ReinitL(); - TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KMaxLogLevel,"- Provider was also reinitialized."); + TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,"- Provider was also reinitialized."); } return *pHostlet; } @@ -1693,7 +1693,7 @@ append = iSharableProviders.Append(pHostlet); if(append==KErrNone) { - TLSLOG_FORMAT((KSenCoreServiceManagerLogChannelBase , KMaxLogLevel, _L8("- Loaded new sharable hostlet instance: 0x%X"), &pHostlet)); + TLSLOG_FORMAT((KSenCoreServiceManagerLogChannelBase , KMinLogLevel, _L8("- Loaded new sharable hostlet instance: 0x%X"), &pHostlet)); CleanupStack::Pop(); // pHostlet } else @@ -1740,6 +1740,7 @@ } } User::LeaveIfError(append); // KErrNoMemory + TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,"CSenXMLDAO::LookupHostletForL: Completed"); return *pHostlet; } diff -r 9e96e2676219 -r 32ab7ae9ec94 webservices/wscredentialmanager/src/sencredentialmanager.cpp --- a/webservices/wscredentialmanager/src/sencredentialmanager.cpp Tue May 11 17:14:12 2010 +0300 +++ b/webservices/wscredentialmanager/src/sencredentialmanager.cpp Tue May 25 13:53:20 2010 +0300 @@ -1336,6 +1336,7 @@ RSenCredentialPtr CSenCredentialManager::CredentialL( TInt aInternalCredentialId, TInt& aErrorTo ) { + TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,"CSenCredentialManager::CredentialL()"); TInt count = iCredentialArray.Count(); for (TInt i=0; i0 && patternFrameworkId == thisFrameworkId)) { + TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,"CSenServiceSession::Matches() - Framework Id not same returning EFalse"); return EFalse; } } diff -r 9e96e2676219 -r 32ab7ae9ec94 webservices/wsframework/src/senwebservicesession.cpp --- a/webservices/wsframework/src/senwebservicesession.cpp Tue May 11 17:14:12 2010 +0300 +++ b/webservices/wsframework/src/senwebservicesession.cpp Tue May 25 13:53:20 2010 +0300 @@ -91,7 +91,7 @@ EXPORT_C void CSenWebServiceSession::ConstructL() { - + TLSLOG(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,_L("CSenWebServiceSession::ConstructL()")); // Sets the local name to "ServiceDescription" // and initiates the inner ipElement CSenServiceSession::BaseConstructL(); @@ -103,6 +103,7 @@ EXPORT_C CSenWebServiceSession::~CSenWebServiceSession() { + TLSLOG(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,_L("CSenWebServiceSession::~CSenWebServiceSession()")); delete iSecurity; delete iContract; delete iEndpoint; @@ -2121,6 +2122,7 @@ EXPORT_C TInt CSenWebServiceSession::AddCredentialObserverL(CSenInternalCredential& aCredential) { + TLSLOG(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,_L("CSenWebServiceSession::AddCredentialObserverL()")); TInt error(KErrNone); RSenCredentialPtr credentialPtr = ((MSenServiceManager&)iFramework.Manager()).CredentialL( @@ -2152,7 +2154,7 @@ } CredentialChanged(MSenCredentialObserver::EAdded, NULL); SetStatusL(); - + TLSLOG(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,_L("CSenWebServiceSession::AddCredentialObserverL() Completed")); return KErrNone; } diff -r 9e96e2676219 -r 32ab7ae9ec94 webservices/wshttpchanneltransportplugin/src/senhttpchannelimpl.cpp --- a/webservices/wshttpchanneltransportplugin/src/senhttpchannelimpl.cpp Tue May 11 17:14:12 2010 +0300 +++ b/webservices/wshttpchanneltransportplugin/src/senhttpchannelimpl.cpp Tue May 25 13:53:20 2010 +0300 @@ -176,34 +176,38 @@ // Ask IAP from user void CSenHttpChannelImpl::ConstructL() { + TLSLOG(KSenHttpChannelLogChannelBase , KMinLogLevel,(_L("CSenHttpChannelImpl::ConstructL()"))); + // Open the RHTTPSession - TLSLOG(KSenHttpChannelLogChannelBase , KMinLogLevel,(_L("- Opening HTTP/TCP session."))); + TLSLOG(KSenHttpChannelLogChannelBase , KMinLogLevel,(_L("CSenHttpChannelImpl::ConstructL() - Opening HTTP/TCP session."))); iSess.OpenL(); // Store the string pool for this HTTP session iStringPool = iSess.StringPool(); - + TLSLOG(KSenHttpChannelLogChannelBase , KMinLogLevel,(_L("CSenHttpChannelImpl::ConstructL() - Calling InstallAuthenticationL()"))); // Install this class as the callback for authentication requests InstallAuthenticationL( iSess ); + TLSLOG(KSenHttpChannelLogChannelBase , KMinLogLevel,(_L("CSenHttpChannelImpl::ConstructL() - Completed InstallAuthenticationL()"))); //Install Proxy Filter iDeflateFilter = EFalse; #ifdef EKA2 //#ifndef _DEBUG + TLSLOG(KSenHttpChannelLogChannelBase , KMinLogLevel,(_L("CSenHttpChannelImpl::ConstructL() - Installing HTTPProxyFilter for EKA2 build."))); CHttpFilterProxyInterface::InstallFilterL( iSess ); + TLSLOG(KSenHttpChannelLogChannelBase , KMinLogLevel,(_L("CSenHttpChannelImpl::ConstructL() - HTTPProxyFilter installed for EKA2 build."))); iSess.StringPool().OpenL(HttpFilterCommonStringsExt::GetLanguageTable()); iSess.StringPool().OpenL(HttpFilterCommonStringsExt::GetTable()); - + TLSLOG(KSenHttpChannelLogChannelBase , KMinLogLevel,(_L("CSenHttpChannelImpl::ConstructL() - Installing HTTPAcceptProxyFilter for EKA2 build."))); CHttpFilterAcceptHeaderInterface::InstallFilterL(iSess); - TLSLOG_L(KSenHttpChannelLogChannelBase , KNormalLogLevel,"HTTPProxyFilter installed for EKA2 build."); - TLSLOG_L(KSenHttpChannelLogChannelBase , KNormalLogLevel,"HTTPAcceptFilter installed for EKA2 build."); + TLSLOG(KSenHttpChannelLogChannelBase , KMinLogLevel,(_L("CSenHttpChannelImpl::ConstructL() - HTTPAcceptProxyFilter installed for EKA2 build."))); //#else // LOG_WRITE_L("HTTPProxyFilter is NOT in use with EKA2 debug builds."); //#endif #else // __INSTALL_HTTP_PROXY_FILTER__ is not defined by macro in .mmp - TLSLOG_L(KSenHttpChannelLogChannelBase , KNormalLogLevel,"HTTPProxyFilter is NOT in use with EKA1."); - TLSLOG_L(KSenHttpChannelLogChannelBase , KNormalLogLevel,"HTTPAcceptProxyFilter is NOT in use with EKA1."); + TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel,"HTTPProxyFilter is NOT in use with EKA1."); + TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel,"HTTPAcceptProxyFilter is NOT in use with EKA1."); #endif // __INSTALL_HTTP_PROXY_FILTER__ iTransObs = CSenHttpEventHandler::NewL(this);//, &iLog); @@ -219,6 +223,7 @@ #ifdef _SENDEBUG ListFilters(); #endif // _SENDEBUG + TLSLOG(KSenHttpChannelLogChannelBase , KMinLogLevel,(_L("CSenHttpChannelImpl::ConstructL() Completed"))); } // Forces preselected IAP to be used! diff -r 9e96e2676219 -r 32ab7ae9ec94 webservices/wslogger/group/senlogger.mmp --- a/webservices/wslogger/group/senlogger.mmp Tue May 11 17:14:12 2010 +0300 +++ b/webservices/wslogger/group/senlogger.mmp Tue May 25 13:53:20 2010 +0300 @@ -56,7 +56,6 @@ SYSTEMINCLUDE ../../inc MW_LAYER_SYSTEMINCLUDE -APP_LAYER_SYSTEMINCLUDE LIBRARY euser.lib LIBRARY flogger.lib diff -r 9e96e2676219 -r 32ab7ae9ec94 webservices/wslogger/src/senlogger.cpp --- a/webservices/wslogger/src/senlogger.cpp Tue May 11 17:14:12 2010 +0300 +++ b/webservices/wslogger/src/senlogger.cpp Tue May 25 13:53:20 2010 +0300 @@ -25,10 +25,8 @@ #include "senlogger.h" -//#include #include #include -#include namespace { @@ -49,7 +47,6 @@ EXPORT_C TInt CSenLogger::CreateL(TInt aChannel, TInt aLevel, const TDesC& aLogDir, const TDesC& aLogFileName, TFileLoggingMode aMode) { TInt index(KErrNotFound); - // CSenLogger* pSenLogger = (CSenLogger*)Dll::Tls(); CSenLogger* pSenLogger = NULL; TWsTls* tls = (TWsTls*)Dll::Tls(); if( !tls ) @@ -65,12 +62,11 @@ pSenLogger = new (ELeave) CSenLogger(); if ( pSenLogger ) { - // Dll::SetTls(pSenLogger); tls->iLogger = pSenLogger; pSenLogger->iCount = 0; //reading the configuration file for the logging levels!!! - /*the file has the following format + /*the file has the following format (IN ANSI) * ============================================================================== * LogChannel LogLevel 1000 0 @@ -92,74 +88,56 @@ RFs fs; res=fs.Connect(); if(res==KErrNone) + { + RFileReadStream readStream; + res=readStream.Open(fs, KPath, EFileRead|EFileStreamText); + if(res == KErrNone) { - - RFileReadStream readStream; - res=readStream.Open(fs,KPath,EFileRead|EFileStreamText); - if(res==KErrNone) - { - TInt error; - TBool result; - TInt retVal; - - CLineReader *readLine = CLineReader::NewL(readStream); - CleanupStack::PushL(readLine); - - do - { - result=readLine->ReadLineL(0,error); - - if(result==CLineReader::ELineHasContent) - { - - TInt *key = new (ELeave) TInt; - - - TLex8 lexBuf(readLine->iBufPtr); - retVal = lexBuf.Val(*key); - - if(retVal!=0) - { - delete key; - - continue; - } - else - { - TInt *value = new (ELeave) TInt; - - - lexBuf.SkipSpace(); - retVal=lexBuf.Val(*value); - if(retVal==0) - { - retVal = pSenLogger->iMap.Append(key,value); - if(retVal != KErrNone) - { - delete key; - delete value; - - } - - } - else - { - delete key; - delete value; - - } - - } - } - - }while(error!=KErrEof); - - CleanupStack::PopAndDestroy(readLine); - readStream.Close(); - } - - fs.Close(); - } + TInt error; + TInt retVal; + do + { + TBuf8<128> readLineBuf; + TRAP(error, readStream.ReadL(readLineBuf, (TChar)'\n')); + if(error == KErrNone) + { + TInt32 length(0); + length = readLineBuf.Length() ; + TInt *key = new (ELeave) TInt; + TLex8 lexBuf(readLineBuf); + retVal = lexBuf.Val(*key); + + if(retVal!=0) + { + delete key; + continue; + } + else + { + TInt *value = new (ELeave) TInt; + lexBuf.SkipSpace(); + retVal=lexBuf.Val(*value); + if(retVal==0) + { + retVal = pSenLogger->iMap.Append(key,value); + if(retVal != KErrNone) + { + delete key; + delete value; + } + } + else + { + delete key; + delete value; + } + } + } + }while(error == KErrNone); + readStream.Close(); + } + fs.Close(); + } } else { diff -r 9e96e2676219 -r 32ab7ae9ec94 webservices/wsmanager/src/rsenservicemanager.cpp --- a/webservices/wsmanager/src/rsenservicemanager.cpp Tue May 11 17:14:12 2010 +0300 +++ b/webservices/wsmanager/src/rsenservicemanager.cpp Tue May 25 13:53:20 2010 +0300 @@ -272,7 +272,7 @@ TInt RSenServiceManager::IdentityProvidersL(CSenChunk& aSenChunk) { - TLSLOG_L(iTLSLogChannel, KMinLogLevel,"RSenServiceManager::IdentityProvidersL"); + TLSLOG_L(iTLSLogChannel, KMinLogLevel,"RSenServiceManager::IdentityProvidersL()"); TIpcArgs args; aSenChunk.ChunkToArgs(args, 0); @@ -284,7 +284,7 @@ TInt RSenServiceManager::ServiceDescriptionsByPatternL(CSenChunk& aSenChunk) { - TLSLOG_L(iTLSLogChannel, KMinLogLevel,"RSenServiceManager::GetServiceDescriptionsByPattern"); + TLSLOG_L(iTLSLogChannel, KMinLogLevel,"RSenServiceManager::ServiceDescriptionsByPatternL()"); TIpcArgs args; aSenChunk.ChunkToArgs(args, 0); @@ -296,7 +296,7 @@ TInt RSenServiceManager::CredentialsL(CSenChunk& aSenChunk) { - TLSLOG_L(iTLSLogChannel, KMinLogLevel,"RSenServiceManager::GetServiceDescriptionsByPattern"); + TLSLOG_L(iTLSLogChannel, KMinLogLevel,"RSenServiceManager::CredentialsL"); TIpcArgs args; aSenChunk.ChunkToArgs(args, 0); @@ -308,7 +308,7 @@ TInt RSenServiceManager::AddCredentialL(CSenChunk& aSenChunk) { - TLSLOG_L(iTLSLogChannel, KMinLogLevel,"RSenServiceManager::GetServiceDescriptionsByPattern"); + TLSLOG_L(iTLSLogChannel, KMinLogLevel,"RSenServiceManager::AddCredentialL()"); TIpcArgs args; aSenChunk.ChunkToArgs(args, 0); @@ -320,7 +320,7 @@ TInt RSenServiceManager::RemoveCredentialsL(CSenChunk& aSenChunk) { - TLSLOG_L(iTLSLogChannel, KMinLogLevel,"RSenServiceManager::GetServiceDescriptionsByPattern"); + TLSLOG_L(iTLSLogChannel, KMinLogLevel,"RSenServiceManager::RemoveCredentialsL()"); TIpcArgs args; aSenChunk.ChunkToArgs(args, 0); diff -r 9e96e2676219 -r 32ab7ae9ec94 webservices/wsoviplugin/src/wsovihandlercontext.cpp --- a/webservices/wsoviplugin/src/wsovihandlercontext.cpp Tue May 11 17:14:12 2010 +0300 +++ b/webservices/wsoviplugin/src/wsovihandlercontext.cpp Tue May 25 13:53:20 2010 +0300 @@ -153,7 +153,10 @@ { if (aKey == HandlerContextKey::KSIF()) { - iWSOviPlugin = (CWSOviPlugin*)aValue; + if(aValue) + { + iWSOviPlugin = (CWSOviPlugin*)aValue; + } return KErrNone; } else if (aKey == HandlerContextKey::KLogger()) diff -r 9e96e2676219 -r 32ab7ae9ec94 webservices/wsoviplugin/src/wsovioauthclient.cpp --- a/webservices/wsoviplugin/src/wsovioauthclient.cpp Tue May 11 17:14:12 2010 +0300 +++ b/webservices/wsoviplugin/src/wsovioauthclient.cpp Tue May 25 13:53:20 2010 +0300 @@ -100,7 +100,7 @@ // CWSOviOAuthClient::~CWSOviOAuthClient() { - TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,"CWSOviOAuthClient::~CWSOviTrustClient"); + TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,"CWSOviOAuthClient::~CWSOviOAuthClient"); delete iAuthSession; delete iBody; } @@ -719,6 +719,10 @@ void CWSOviOAuthClient::CreateBodyL(const TDesC8& aXmlNs, const TDesC8& aUsername, const TDesC8& aPassword, const TDesC8& aCreated) { + if(aPassword == KNullDesC8()) + { + TLSLOG(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,(_L("CWSOviOAuthClient::CreateBodyL() - aPassword == KNullDesC8"))); + } delete iBody; iBody = NULL; HBufC8* nonce = SenCryptoUtils::GetRandomNonceL(); diff -r 9e96e2676219 -r 32ab7ae9ec94 webservices/wsoviplugin/src/wsoviplugin.cpp --- a/webservices/wsoviplugin/src/wsoviplugin.cpp Tue May 11 17:14:12 2010 +0300 +++ b/webservices/wsoviplugin/src/wsoviplugin.cpp Tue May 25 13:53:20 2010 +0300 @@ -76,12 +76,13 @@ // CWSOviPlugin::~CWSOviPlugin() { + TLSLOG(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,(_L("CWSOviPlugin::~CWSOviPlugin()"))); iMsgHandlers.ResetAndDestroy(); iSessionHandlers.ResetAndDestroy(); iHandlerContexts.ResetAndDestroy(); iVersions.Reset(); iIMSI.Close(); - TLSLOG(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,(_L("CWSOviPlugin::~CWSOviPlugin()"))); + TLSLOG(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,(_L("CWSOviPlugin::~CWSOviPlugin() Completed"))); } // --------------------------------------------------------------------------- @@ -90,7 +91,7 @@ // void CWSOviPlugin::ConstructL() { - TLSLOG(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,(_L("CWSOviPlugin::ConstructL"))); + TLSLOG(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,(_L("CWSOviPlugin::ConstructL()"))); BaseConstructL(KFrameworkXMLNS, KFrameworkLocalName); //load default setup of handlers @@ -102,6 +103,7 @@ AddHandlerL(KSecurityValue, KNullDesC8, SenHandler::EMessageHandler); AddHandlerL(KEncoderValue, KNullDesC8, SenHandler::EMessageHandler); AddHandlerL(KServiceUpdateValue, KNullDesC8, SenHandler::ESessionHandler); + TLSLOG(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,(_L("CWSOviPlugin::ConstructL() Completed"))); } //======================================================== diff -r 9e96e2676219 -r 32ab7ae9ec94 webservices/wsoviplugin/src/wsoviregisterhandler.cpp --- a/webservices/wsoviplugin/src/wsoviregisterhandler.cpp Tue May 11 17:14:12 2010 +0300 +++ b/webservices/wsoviplugin/src/wsoviregisterhandler.cpp Tue May 25 13:53:20 2010 +0300 @@ -51,15 +51,18 @@ // Destructor CWSOviRegisterHandler::~CWSOviRegisterHandler() { + TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,"CWSOviRegisterHandler::~CWSOviRegisterHandler()"); } // Second phase construction. void CWSOviRegisterHandler::ConstructL() { + TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,"CWSOviRegisterHandler::ConstructL()"); } TInt CWSOviRegisterHandler::InvokeL(MSenSessionContext& aCtx) { + TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,"CWSOviRegisterHandler::InvokeL()"); MSenServiceDescription& pServiceDescription = *(MSenServiceDescription*)aCtx.GetSenWSDescriptionL(WSOviContextKeys::KServiceDescription()); const TDesC8* action = aCtx.GetDesC8L(WSOviContextKeys::KRegisterAction()); TInt result(KErrNone); @@ -148,6 +151,7 @@ TInt CWSOviRegisterHandler::UnregisterServiceDescriptionL( MSenServiceDescription& aServiceDescription) { + TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,"CWSOviRegisterHandler::UnregisterServiceDescriptionL()"); TInt retval(KErrNone); CWSOviServiceSession *pSession = NULL; TPtrC8 contract = aServiceDescription.Contract(); @@ -268,13 +272,13 @@ if(aServiceDescription->DescriptionClassType() == MSenServiceDescription::EOviOAuthClient) { - TLSLOG(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,(_L("CWSOviRegisterHandler::CWSOviRegisterHandler - This ServiceDescription is already an NAUTH Client"))); + TLSLOG(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,(_L("CWSOviRegisterHandler::UnRegisterAuthClientL - This ServiceDescription is already an NAUTH Client"))); pAuthClient = (CWSOviOAuthClient*)aServiceDescription; retval = iHandlerContext.GetSenCoreServiceManager()->RemoveServiceDescriptionL(*pAuthClient); } else { - + TLSLOG(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,(_L("CWSOviRegisterHandler::UnRegisterAuthClientL - This ServiceDescription is not NAUTH Client"))); pSession = CWSOviServiceSession::NewLC(*(CSIF*)iHandlerContext.GetAnyL(HandlerContextKey::KSIF())); retval = pSession->InitializeFromL(*aServiceDescription); if(retval != KErrNone) diff -r 9e96e2676219 -r 32ab7ae9ec94 webservices/wsoviplugin/src/wsoviservicesession.cpp --- a/webservices/wsoviplugin/src/wsoviservicesession.cpp Tue May 11 17:14:12 2010 +0300 +++ b/webservices/wsoviplugin/src/wsoviservicesession.cpp Tue May 25 13:53:20 2010 +0300 @@ -63,6 +63,7 @@ CWSOviServiceSession::~CWSOviServiceSession() { + TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,"CWSOviServiceSession::~CWSOviServiceSession()"); delete iSessionContext; delete iProviderID; delete iTrustAnchor; @@ -90,6 +91,7 @@ void CWSOviServiceSession::ConstructL() { + TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,"CWSOviServiceSession::ConstructL()"); CSenWebServiceSession::ConstructL(); iTokenObs = CWSOviCredentialObserver::NewL(this,iFramework.Manager().Log()); } @@ -263,8 +265,9 @@ TPtrC8 thisProviderID = ProviderID(); if(patternProviderID.Length()>0) { - if(!(thisProviderID.Length()>0 && patternProviderID == thisProviderID)) + if( !(thisProviderID.Length()>0 && patternProviderID == thisProviderID) ) { + TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,"CWSOviServiceSession::Matches() - Provider Id not same returning EFalse"); return EFalse; } } @@ -701,11 +704,12 @@ MSenRemoteServiceConsumer& aConsumer, MSenProperties* aResponseTransportProperties) { + TLSLOG_L(KSenClientSessionLogChannelBase+aConsumer.ConnectionId() , KMinLogLevel,"CWSOviServiceSession::SendToConsumerL()"); ((CWSOviPlugin&)iFramework).ProcessInboundDispatchL(this, KErrNone, aMessage, aResponseTransportProperties); - TLSLOG_L(KSenClientSessionLogChannelBase+aConsumer.ConnectionId() , KMinLogLevel,"CWSOviServiceSession::ParseMessageL(CSenSoapMessage& )"); iRenewCounter = 0; iRetryCounter = 0; - return aConsumer.HandleMessageL( aMessage, aTxnId, aResponseTransportProperties ); + TInt retVal = aConsumer.HandleMessageL( aMessage, aTxnId, aResponseTransportProperties ); + return retVal; } TInt CWSOviServiceSession::SendErrorToConsumerL( const TInt aErrorCode, @@ -1163,6 +1167,7 @@ TInt CWSOviServiceSession::ShareTokenWithL( CWSOviServiceSession* aWSOviSessionDst) { + TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,"CWSOviServiceSession::ShareTokenWithL()"); TInt error(KErrNone); if ( !HasSecurity() ) { @@ -1182,22 +1187,27 @@ } else { + TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,"CWSOviServiceSession::ShareTokenWithL() returning KErrNotFound"); return KErrNotFound; } } void CWSOviServiceSession::AddCredentialL( const TDesC8& aSecurity, TTime aValidUntil ) { + TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,"CWSOviServiceSession::AddCredentialL(aSecurity, aValidUntil)"); iValidUntil = aValidUntil; SetSecurityL(aSecurity); SetStatusL(); + TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,"CWSOviServiceSession::AddCredentialL(aSecurity, aValidUntil) Completed"); } void CWSOviServiceSession::AddCredentialL(RSenCredentialPtr aCredentialPtr, TTime aValidUntil) { + TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,"CWSOviServiceSession::AddCredentialL(aCredentialPtr, aValidUntil)"); iValidUntil = aValidUntil; SetCredentialPtrL(aCredentialPtr); // Share same Credential between multiple Sessions //codescannerwarnings SetStatusL(); + TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,"CWSOviServiceSession::AddCredentialL(aCredentialPtr, aValidUntil) Completed"); } TBool CWSOviServiceSession::AmIHostletSession()