diff -r bf3935de63a1 -r ab1e518f96da webservices/wsmanager/src/senservicemanagerimpl.cpp --- a/webservices/wsmanager/src/senservicemanagerimpl.cpp Wed Mar 31 23:17:32 2010 +0300 +++ b/webservices/wsmanager/src/senservicemanagerimpl.cpp Wed Apr 14 17:07:28 2010 +0300 @@ -180,6 +180,7 @@ */ TPtrC CSenServiceManagerImpl::NextChunkNameL() //Codescannerwarnings { + TLSLOG_L(KSenServiceManagerLogChannelBase+iConnectionID, KMinLogLevel,"CSenServiceManagerImpl::NextChunkNameL"); if(ipChunkName) { iChunkNameNumber++; @@ -204,7 +205,6 @@ pos = chunkname.Find(KDash); } TLSLOG_FORMAT((KSenServiceManagerLogChannelBase+iConnectionID, KNormalLogLevel , _L("CSenServiceManagerImpl::NextChunkNameL(): %S"), &chunkname)); - return chunkname; } else @@ -219,6 +219,7 @@ TInt CSenServiceManagerImpl::ServiceDescriptionsL(const TDesC8& aUri, RServiceDescriptionArray& aList) { + TLSLOG_L(KSenServiceManagerLogChannelBase+iConnectionID, KMinLogLevel,"CSenServiceManagerImpl::ServiceDescriptionsL(aUri, aList)"); TInt retVal(KErrNone); TPtrC8 descriptions; @@ -242,12 +243,14 @@ } } CleanupStack::PopAndDestroy(pSenChunk); // Close chunk + TLSLOG_FORMAT((KSenServiceManagerLogChannelBase+iConnectionID, KMinLogLevel , _L8("CSenServiceManagerImpl::ServiceDescriptionsL(aUri, aList) returns [%d]"), retVal)); return retVal; } TInt CSenServiceManagerImpl::ServiceDescriptionsL(MSenServiceDescription& aSD, RServiceDescriptionArray& aList) { + TLSLOG_L(KSenServiceManagerLogChannelBase+iConnectionID, KMinLogLevel,"CSenServiceManagerImpl::ServiceDescriptionsL(aSD, aList)"); TInt retVal(KErrNone); HBufC8* pPattern = aSD.AsXmlL(); @@ -278,12 +281,13 @@ // In any case, destroy the pattern as XML buffer: CleanupStack::PopAndDestroy(); // pPattern - + TLSLOG_FORMAT((KSenServiceManagerLogChannelBase+iConnectionID, KMinLogLevel , _L8("CSenServiceManagerImpl::ServiceDescriptionsL(aSD, aList) returns [%d]"), retVal)); return retVal; } TInt CSenServiceManagerImpl::RegisterServiceDescriptionL(MSenServiceDescription& aSD) { + TLSLOG_L(KSenServiceManagerLogChannelBase+iConnectionID, KMinLogLevel,"CSenServiceManagerImpl::RegisterServiceDescriptionL(aSD)"); // do not register if both endpoint and contract are // missing if(aSD.Endpoint().Length()==0 && aSD.Contract().Length()==0) @@ -323,7 +327,7 @@ // now register the XML string (descriptor) to WSF Symbian server: TInt retVal(iConnection.RegisterServiceDescription(ptr)); CleanupStack::PopAndDestroy(); // pAsXml - + TLSLOG_FORMAT((KSenServiceManagerLogChannelBase+iConnectionID, KMinLogLevel , _L8("CSenServiceManagerImpl::RegisterServiceDescriptionL(aSD) returns [%d]"), retVal)); return retVal; } } @@ -331,6 +335,7 @@ TInt CSenServiceManagerImpl::UnregisterServiceDescriptionL( MSenServiceDescription& aSD) { + TLSLOG_L(KSenServiceManagerLogChannelBase+iConnectionID, KMinLogLevel,"CSenServiceManagerImpl::UnregisterServiceDescriptionL(aSD)"); // do not unregister if both endpoint and contract are // missing if(aSD.Endpoint().Length()==0 && aSD.Contract().Length()==0) @@ -371,6 +376,7 @@ TPtr8 ptr = pAsXml->Des(); TInt retVal(iConnection.UnregisterServiceDescription(ptr)); CleanupStack::PopAndDestroy(); // pAsXml + TLSLOG_FORMAT((KSenServiceManagerLogChannelBase+iConnectionID, KMinLogLevel , _L8("CSenServiceManagerImpl::UnregisterServiceDescriptionL(aSD) returns [%d]"), retVal)); return retVal; } } @@ -378,6 +384,7 @@ TInt CSenServiceManagerImpl::RegisterIdentityProviderL( CSenIdentityProvider& aProvider) { + TLSLOG_L(KSenServiceManagerLogChannelBase+iConnectionID, KMinLogLevel,"CSenServiceManagerImpl::RegisterIdentityProviderL(aProvider)"); HBufC8* provider = aProvider.AsXmlL(); TPtr8 ptr = provider->Des(); TInt retVal = iConnection.RegisterIdentityProvider(ptr); @@ -388,6 +395,7 @@ TInt CSenServiceManagerImpl::UnregisterIdentityProviderL( CSenIdentityProvider& aProvider) { + TLSLOG_L(KSenServiceManagerLogChannelBase+iConnectionID, KMinLogLevel,"CSenServiceManagerImpl::UnregisterIdentityProviderL(aProvider)"); HBufC8* provider = aProvider.AsXmlL(); TPtr8 ptr = provider->Des(); TInt retVal(iConnection.UnregisterIdentityProvider(ptr)); @@ -398,6 +406,7 @@ TInt CSenServiceManagerImpl::AssociateServiceL(const TDesC8& aServiceID, const TDesC8& aProviderID) { + TLSLOG_L(KSenServiceManagerLogChannelBase+iConnectionID, KMinLogLevel,"CSenServiceManagerImpl::AssociateServiceL(aServiceID, aProviderID)"); if (aServiceID.Length() <= 0 || aProviderID.Length() <= 0) { return KErrArgument; @@ -411,6 +420,7 @@ TInt CSenServiceManagerImpl::DissociateServiceL(const TDesC8& aServiceID, const TDesC8& aProviderID) { + TLSLOG_L(KSenServiceManagerLogChannelBase+iConnectionID, KMinLogLevel,"CSenServiceManagerImpl::DissociateServiceL(aServiceID, aProviderID)"); if (aServiceID.Length() <= 0 || aProviderID.Length() <= 0) { return KErrArgument; @@ -668,6 +678,7 @@ RCredentialArray& aCredentials, RCredentialPropertiesArray& aCredentialProperties) { + TLSLOG_L(KSenServiceManagerLogChannelBase+iConnectionID, KMinLogLevel,"CSenServiceManagerImpl::CredentialsL(aEndpoint, aCredentials, aCredentialProperties)"); TInt retVal(KErrNone); CSenXmlServiceDescription* pServDesc = CSenXmlServiceDescription::NewLC(); @@ -685,6 +696,7 @@ RCredentialArray& aCredentials, RCredentialPropertiesArray& aCredentialProperties) { + TLSLOG_L(KSenServiceManagerLogChannelBase+iConnectionID, KMinLogLevel,"CSenServiceManagerImpl::CredentialsL(aEndpoint, aIdP, aCredentials, aCredentialProperties)"); TInt retVal(KErrNone); TPtrC8 credentials; @@ -734,6 +746,7 @@ RCredentialArray& aCredentials, RCredentialPropertiesArray& aCredentialProperties) { + TLSLOG_L(KSenServiceManagerLogChannelBase+iConnectionID, KMinLogLevel,"CSenServiceManagerImpl::CredentialsL(aEndpoint, aUserName, aPassword, aCredentials, aCredentialProperties)"); TInt retVal(KErrNone); TPtrC8 credentials; @@ -780,6 +793,7 @@ RCredentialArray& aCredentials, RCredentialPropertiesArray& aCredentialProperties) { + TLSLOG_L(KSenServiceManagerLogChannelBase+iConnectionID, KMinLogLevel,"CSenServiceManagerImpl::CredentialsL(aPattern, aCredentials, aCredentialProperties)"); TInt retVal(KErrNone); TPtrC8 credentials; @@ -870,6 +884,7 @@ RCredentialArray& aCredentials, RCredentialPropertiesArray& aCredentialProperties) { + TLSLOG_L(KSenServiceManagerLogChannelBase+iConnectionID, KMinLogLevel,"CSenServiceManagerImpl::CredentialsL(aPattern, aIdP, aCredentials, aCredentialProperties)"); TInt retVal(KErrNone); TPtrC8 credentials; @@ -916,6 +931,7 @@ RCredentialArray& aCredentials, RCredentialPropertiesArray& aCredentialProperties) { + TLSLOG_L(KSenServiceManagerLogChannelBase+iConnectionID, KMinLogLevel,"CSenServiceManagerImpl::CredentialsL(aPattern, aUserName, aPassword, aCredentials, aCredentialProperties)"); TInt retVal(KErrNone); TPtrC8 credentials; @@ -963,6 +979,7 @@ const CSenIdentityProvider& aIdP, const CSenCredential2& aCredential) { + TLSLOG_L(KSenServiceManagerLogChannelBase+iConnectionID, KMinLogLevel,"CSenServiceManagerImpl::AddCredentialL(aPattern, aIdP, aCredentials)"); TInt retVal(KErrNone); if(&aPattern == NULL || &aIdP == NULL || &aCredential== NULL) @@ -1004,6 +1021,7 @@ const CSenIdentityProvider& aIdP, const CSenCredential2& aCredential) { + TLSLOG_L(KSenServiceManagerLogChannelBase+iConnectionID, KMinLogLevel,"CSenServiceManagerImpl::AddCredentialL(aEndpoint, aIdP, aCredentials)"); CSenXmlServiceDescription* pServDesc = CSenXmlServiceDescription::NewLC(); pServDesc->SetEndPointL(aEndpoint); @@ -1019,6 +1037,7 @@ const CSenCredential2& aCredential, const CSenXmlProperties& aCredentialProperties) { + TLSLOG_L(KSenServiceManagerLogChannelBase+iConnectionID, KMinLogLevel,"CSenServiceManagerImpl::AddCredentialL(aPattern, aIdP, aCredentials, aCredentialProperties)"); TInt retVal(KErrNone); if(&aPattern == NULL || &aIdP == NULL || &aCredential== NULL || &aCredentialProperties == NULL ) @@ -1067,6 +1086,7 @@ const CSenCredential2& aCredential, const CSenXmlProperties& aCredentialProperties) { + TLSLOG_L(KSenServiceManagerLogChannelBase+iConnectionID, KMinLogLevel,"CSenServiceManagerImpl::AddCredentialL(aEndpoint, aIdP, aCredentials, aCredentialProperties)"); CSenXmlServiceDescription* pServDesc = CSenXmlServiceDescription::NewLC(); pServDesc->SetEndPointL(aEndpoint); @@ -1079,10 +1099,12 @@ TInt CSenServiceManagerImpl::RemoveCredentialsL(const CSenIdentityProvider& aIdP) { + TLSLOG_L(KSenServiceManagerLogChannelBase+iConnectionID, KMinLogLevel,"CSenServiceManagerImpl::RemoveCredentialsL(aIdp)"); TInt retVal(KErrNone); if(&aIdP == NULL) { + TLSLOG_L(KSenServiceManagerLogChannelBase+iConnectionID, KMinLogLevel,"CSenServiceManagerImpl::RemoveCredentialsL(aIdp) returns KErrArgument"); return KErrArgument; } @@ -1104,12 +1126,13 @@ CleanupStack::PopAndDestroy(pIdPAsXml); + TLSLOG_FORMAT((KSenServiceManagerLogChannelBase+iConnectionID, KMinLogLevel , _L8("CSenServiceManagerImpl::RemoveCredentialsL(aIdp) returns [%d]"), retVal)); return retVal; - } TInt CSenServiceManagerImpl::RemoveCredentialsL(const MSenServiceDescription& aPattern, const CSenIdentityProvider& aIdP) { + TLSLOG_L(KSenServiceManagerLogChannelBase+iConnectionID, KMinLogLevel,"CSenServiceManagerImpl::RemoveCredentialsL(aPattern, aIdP)"); TInt retVal(KErrNone); if(&aPattern == NULL || &aIdP == NULL) @@ -1146,6 +1169,7 @@ const TDesC8& aUserName, const TDesC8& aPassword) { + TLSLOG_L(KSenServiceManagerLogChannelBase+iConnectionID, KMinLogLevel,"CSenServiceManagerImpl::RemoveCredentialsL(aPattern, aUserName, aPassword)"); CSenIdentityProvider* pIdP = CSenIdentityProvider::NewLC(KIdentityProviderName); pIdP->SetUserInfoL(aUserName, aUserName, aPassword); @@ -1159,6 +1183,7 @@ TInt CSenServiceManagerImpl::IdentityProvidersL( RIdentityProviderArray& aList ) { + TLSLOG_L(KSenServiceManagerLogChannelBase+iConnectionID, KMinLogLevel,"CSenServiceManagerImpl::IdentityProvidersL(aList)"); TInt retVal(KErrNone); TPtrC8 descriptions; @@ -1182,7 +1207,7 @@ TInt CSenServiceManagerImpl::ExtractIdentiyProvidersL(TPtrC8& aIdPs, RIdentityProviderArray& aList) { - TLSLOG_L(KSenServiceManagerLogChannelBase+iConnectionID, KMinLogLevel,"CSenServiceManagerImpl::ExtractIdentiyProvidersL"); + TLSLOG_L(KSenServiceManagerLogChannelBase+iConnectionID, KMinLogLevel,"CSenServiceManagerImpl::ExtractIdentiyProvidersL(aIdPs, aList)"); TInt retVal(KErrNotFound); @@ -1280,6 +1305,7 @@ } TAny* CSenServiceManagerImpl::InterfaceByUid( TUid aUID ) { + TLSLOG_L(KSenServiceManagerLogChannelBase+iConnectionID, KMinLogLevel,"CSenServiceManagerImpl::InterfaceByUid(aUID)"); if ( aUID == KSenInterfaceUidInternalServiceManager ) { TLSLOG_FORMAT(( KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel , _L8("CSenServiceConnectionImpl::InterfaceByUid(%d) == KSenInterfaceUidInternalServiceManager" ), aUID.iUid ));