# HG changeset patch
# User Pat Downey <patd@symbian.org>
# Date 1283340485 -3600
# Node ID 1adb97a15c2f83700ff51541358b66d60c0728a6
# Parent  c5fabff9b552451a7a6395206b2d9db3789cad9d
Revert incorrect RCL_3 drop:
Revision: 201033
Kit: 201035

diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wsconnection/src/senserviceconnectionimpl.cpp
--- a/webservices/wsconnection/src/senserviceconnectionimpl.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wsconnection/src/senserviceconnectionimpl.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -45,9 +45,9 @@
 
 #include "senservicemanagerdefines.h"
 #include "SenBaseAttribute.h"
-#include <xml/dom/xmlengchunkcontainer.h>
-#include <xml/dom/xmlengfilecontainer.h>
-#include <xml/dom/xmlengserializer.h>
+#include <xmlengchunkcontainer.h>
+#include <xmlengfilecontainer.h>
+#include <xmlengserializer.h>
 #include "senconnagentserver.h"
 #include "senxmldebug.h"
 #include "senatomentry.h"
@@ -621,7 +621,6 @@
             TLSLOG_L(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel ,"SubmitL - ESenInternalError");
             retVal = KErrSenInternal;
             }
-            break;
         default:
             {
             TLSLOG_L(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel ,"SubmitL - default");
@@ -2512,19 +2511,16 @@
     		}
     	else
         	{
-	    	TMessage message = ipSenServiceDispatcher->GetMessageFromQueue(aTransactionID);
-	    	CSenAsyncOperation* pAsyncOp = message.iSenAsyncOperation;
-	    	if (pAsyncOp)
-	    	    {
-	            TInt idx(-1);
-	            TRAP( retVal,
-					idx = AsyncOpsArrayL().Find(pAsyncOp);
-		            if (idx >= 0)
-		                {
-		                AsyncOpsArrayL().Remove(idx);
-		                }
-				  );
-	    	    pAsyncOp->iActive = NULL;
+    	TMessage message = ipSenServiceDispatcher->GetMessageFromQueue(aTransactionID);
+    	CSenAsyncOperation* pAsyncOp = message.iSenAsyncOperation;
+    	if (pAsyncOp)
+    	    {
+            TInt idx = AsyncOpsArrayL().Find(pAsyncOp);    
+            if (idx >= 0)
+                {
+                AsyncOpsArrayL().Remove(idx);
+                }
+    	    pAsyncOp->iActive = NULL;
     	    
     	    pAsyncOp->Cancel();
             delete pAsyncOp;
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wscore/group/sencore.mmp
--- a/webservices/wscore/group/sencore.mmp	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wscore/group/sencore.mmp	Wed Sep 01 12:28:05 2010 +0100
@@ -57,6 +57,7 @@
 
 // Currently, WS-stack requires (and consumes MAX) 4 MBs of heap
 EPOCHEAPSIZE 0x060000 0x400000
+EPOCSTACKSIZE 0x3000
 
 SOURCEPATH ../src
 SOURCE senclientsession.cpp
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wscore/inc/senmobilityobserver.h
--- a/webservices/wscore/inc/senmobilityobserver.h	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wscore/inc/senmobilityobserver.h	Wed Sep 01 12:28:05 2010 +0100
@@ -105,7 +105,6 @@
 	TUint32 iSnapId;
 	CSenXmlReader &iReader ;
 	TBool iOCCenabled;
-	private:    // Data	      
 	};
     
 #endif /*M_SEN_MOBILITY_OBSERVER_H    */
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wscore/src/senclientsession.cpp
--- a/webservices/wscore/src/senclientsession.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wscore/src/senclientsession.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -37,7 +37,7 @@
 #include <SenXmlUtils.h>
 #include <SenXmlProperties.h>
 
-#include <xml/dom/xmlengnodelist.h> 
+#include <xmlengnodelist.h> 
 #include <defaultcaps.hrh>
 
 #include "senclientsession.h"
@@ -59,9 +59,9 @@
 
 #include "SenSoapEnvelope2.h"
 #include "sensoapmessagedom2.h"
-#include <xml/dom/xmlengchunkcontainer.h>
-#include <xml/dom/xmlengfilecontainer.h>
-#include <xml/dom/xmlengdeserializer.h>
+#include "xmlengchunkcontainer.h"
+#include "xmlengfilecontainer.h"
+#include "xmlengdeserializer.h"
 #include "SenParser.h"
 #include "seninternalcredential.h"
 #include "senservercontext.h"
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wscore/src/senxmldao.cpp
--- a/webservices/wscore/src/senxmldao.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wscore/src/senxmldao.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -1712,16 +1712,16 @@
         // when server (main thread) goes down.
         
         pLookupInfo = NULL;
-        if(pHostlet->Threadsafe())
+        if(pHostlet && pHostlet->Threadsafe())
             {
-            TLSLOG_L(KSenCoreServiceManagerLogChannelBase  , KMaxLogLevel,"- Adding new threadsafe, unsharable provider into cache.");
+            TLSLOG_L(KSenCoreServiceManagerLogChannelBase  , KMinLogLevel,"- Adding new threadsafe, unsharable provider into cache.");
             pLookupInfo = CSenHostletLookupInfo::NewLC(aReqThreadId, aReqConsumerId);
             }
         else
             {
             // Any non-threadsafe provider should compare whether consumer ID
             // is equal. The thread ID is irrelevant in the matching.
-            TLSLOG_L(KSenCoreServiceManagerLogChannelBase  , KMaxLogLevel,"- Adding new non-threadsafe, unsharable provider into cache.");
+            TLSLOG_L(KSenCoreServiceManagerLogChannelBase  , KMinLogLevel,"- Adding new non-threadsafe, unsharable provider into cache.");
             pLookupInfo = CSenHostletLookupInfo::NewLC(KNullDesC, aReqConsumerId);
             }
 
@@ -1729,7 +1729,7 @@
         append = iUnsharableProviders.Append(pLookupInfo, pHostlet);
         if(append==KErrNone)
             {
-            TLSLOG_FORMAT((KSenCoreServiceManagerLogChannelBase  , KMaxLogLevel, _L8("- Loaded new unsharable hostlet instance: 0x%X, lookup info: 0x%X, lookup count: %d"), pHostlet, pLookupInfo, pLookupInfo->LookupCount()));
+            TLSLOG_FORMAT((KSenCoreServiceManagerLogChannelBase  , KMinLogLevel, _L8("- Loaded new unsharable hostlet instance: 0x%X, lookup info: 0x%X, lookup count: %d"), pHostlet, pLookupInfo, pLookupInfo->LookupCount()));
             CleanupStack::Pop(2); // pLookupInfo, pHostlet
             }
         else
@@ -1933,12 +1933,26 @@
 
 TPtrC CSenHostletLookupInfo::ThreadId() const
     {
-    return *ipFullThreadName;
+    if(ipFullThreadName)
+    	{
+    	return *ipFullThreadName;
+    	}
+    else
+    	{
+    	return KNullDesC();
+    	}
     }
 
 TPtrC8 CSenHostletLookupInfo::ConsumerId() const
     {
-    return *ipUniqueConsumerId;
+    if(ipUniqueConsumerId)
+    	{
+    	return *ipUniqueConsumerId;
+    	}
+    else
+    	{
+    	return KNullDesC8();
+    	}	
     }
 
 
@@ -1960,9 +1974,15 @@
 
 TBool CSenHostletLookupInfo::operator==(const CSenHostletLookupInfo& aHostletRequestor)
     {
-    return((ipFullThreadName->Length()==0 || aHostletRequestor.ThreadId() == *ipFullThreadName)
+    if(ipFullThreadName && ipUniqueConsumerId)
+    	{
+    	return((ipFullThreadName->Length()==0 || aHostletRequestor.ThreadId() == *ipFullThreadName)
             && aHostletRequestor.ConsumerId() == *ipUniqueConsumerId);
-    
+    	}
+    else
+    	{
+    	return EFalse;
+    	}	
     //    return (aHostletRequestor.ThreadId() == *ipFullThreadName
 //            && aHostletRequestor.ConsumerId() == *ipUniqueConsumerId);
     }
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wscredentialmanager/src/sencredentialmanager.cpp
--- a/webservices/wscredentialmanager/src/sencredentialmanager.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wscredentialmanager/src/sencredentialmanager.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -47,7 +47,7 @@
 #include "senwebservicesession.h"
 
 #include <SenServiceConnection.h> // KErrSenNoPermission ( -30315 )
-#include <xml/dom/xmlengnodelist.h> 
+#include <xmlengnodelist.h> 
 #include <SenCredential.h>
 
 #include <SenXmlUtils.h>
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wscredentialmanager/src/seninternalcredential.cpp
--- a/webservices/wscredentialmanager/src/seninternalcredential.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wscredentialmanager/src/seninternalcredential.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -42,7 +42,7 @@
     //#include "Attribute.h"
 #endif
 
-#include <xml/dom/xmlengnodelist.h> 
+#include <xmlengnodelist.h> 
 using namespace Xml;
 
 namespace
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wsdescription/src/servicepolicy.cpp
--- a/webservices/wsdescription/src/servicepolicy.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wsdescription/src/servicepolicy.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -15,13 +15,6 @@
 *
 */
 
-
-
-
-
-
-
-
 // INCLUDE FILES
 #include <e32std.h>
 #include <s32strm.h>
@@ -378,10 +371,10 @@
                 }
                 
             } 
-             
         }
 
      }
+	 
 void CServicePolicy::AddUserAgentElementsL(CSenElement* aUserAgentElement)
     {
     CSenElement* pClientPolicyElement = AsElement().Element(KClientServicePolicyLocalName);
@@ -587,7 +580,6 @@
         }
     else //Just add this policy in the <PolicyArray>
         {
-        
         CSenElement& apol= pPolicyArray->AddElementL(KPolicyLocalName);
         apol.CopyFromL(*aPolicy);                                
         PolicyIdL(&apol);	//codescannerwarnings
@@ -787,6 +779,8 @@
             return EFalse;
     }                    
 
+    return EFalse;
+    
 }
 HBufC8* CServicePolicy::ClientPolicyValue(const TDesC8& aKey)
     {
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wsfragment/inc/wslibxml2utils.h
--- a/webservices/wsfragment/inc/wslibxml2utils.h	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wsfragment/inc/wslibxml2utils.h	Wed Sep 01 12:28:05 2010 +0100
@@ -26,7 +26,7 @@
 #define WS_LIBXML2_UTILS_H_INCLUDED
 
 #include <e32base.h>
-#include <xml/dom/xmlengelement.h>
+#include "xmlengelement.h"
 
 class WsXmlUtils
 {
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wsfragment/src/rsendocument.cpp
--- a/webservices/wsfragment/src/rsendocument.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wsfragment/src/rsendocument.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -21,8 +21,8 @@
 
 
 #include "RSenDocument.h"
-#include <xml/utils/xmlengxestd.h>
-#include <xml/dom/xmlengdomimplementation.h>
+#include <xmlengxestd.h>
+#include <xmlengdomimplementation.h>
 
 LOCAL_C void CleanupRSenDocument(TAny* aDocumentData)
 	{
@@ -59,17 +59,12 @@
     RXmlEngDocument doc;
     doc.OpenL(domImpl);
     RSenDocument document;
-    CleanupClosePushL(document);
-	document.ipData =  NULL;
-	document.iInternal = NULL;
     document.ipData = new (ELeave) TSenDocumentData;
     document.iInternal =
         (reinterpret_cast<RSenDocument*>(const_cast<RXmlEngDocument*>(&doc)))->iInternal;
     document.ipData->iInternal = document.iInternal;
-	document.ipData->ipOpenDocuments = NULL;
     document.ipData->ipOpenDocuments = new (ELeave) TInt(1);
     document.ipData->iDomImpl = domImpl;
-    CleanupStack::Pop();
     TCleanupItem cleanup(CleanupRSenDocument, document.ipData);
     CleanupStack::PushL(cleanup);
     return document;
@@ -94,17 +89,12 @@
     RXmlEngDocument doc;
     doc.OpenL(domImpl, aInternal);
     RSenDocument document;
-    CleanupClosePushL(document);
-	document.ipData =  NULL;
-	document.iInternal = NULL;	 
     document.ipData = new (ELeave) TSenDocumentData;
     document.iInternal =
         (reinterpret_cast<RSenDocument*>(const_cast<RXmlEngDocument*>(&doc)))->iInternal;
     document.ipData->iInternal = document.iInternal;
-	document.ipData->ipOpenDocuments = NULL;	
     document.ipData->ipOpenDocuments = new (ELeave) TInt(1);
     document.ipData->iDomImpl = domImpl;
-     CleanupStack::Pop();
     TCleanupItem cleanup(CleanupRSenDocument, document.ipData);
     CleanupStack::PushL(cleanup);
     return document;
@@ -118,28 +108,26 @@
 
 EXPORT_C void RSenDocument::Close()
     {
-	if(ipData && ipData->ipOpenDocuments)
-		{
-	    *ipData->ipOpenDocuments = *ipData->ipOpenDocuments - 1;
-	    if ( !*ipData->ipOpenDocuments )
-	        {
-	        RXmlEngDOMImplementation domImpl = ipData->iDomImpl;
-	        iInternal = ipData->iInternal;
-	        delete ipData->ipOpenDocuments;
-	        delete ipData;
-	        RXmlEngDocument::Close();
-	        domImpl.Close();
-	    	TBool* pDisabled = (TBool*)Dll::Tls();
-	    	if ( !pDisabled )
-	    	    {
-	            XmlEngineCleanup();
-	    	    }
-	        }
-	    else
-	        {
-	        iInternal = NULL;
-	        }
-       }
+    *ipData->ipOpenDocuments = *ipData->ipOpenDocuments - 1;
+    if ( !*ipData->ipOpenDocuments )
+        {
+        RXmlEngDOMImplementation domImpl = ipData->iDomImpl;
+        iInternal = ipData->iInternal;
+        delete ipData->ipOpenDocuments;
+        delete ipData;
+        RXmlEngDocument::Close();
+        domImpl.Close();
+    	TBool* pDisabled = (TBool*)Dll::Tls();
+    	if ( !pDisabled )
+    	    {
+            XmlEngineCleanup();
+    	    }
+        }
+    else
+        {
+        iInternal = NULL;
+        }
+       
     }
 
 EXPORT_C void RSenDocument::Destroy()
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wsfragment/src/sendomfragmentbase.cpp
--- a/webservices/wsfragment/src/sendomfragmentbase.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wsfragment/src/sendomfragmentbase.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -24,7 +24,7 @@
 
 // INCLUDE FILES
 #include "SenDomFragmentBase.h"
-#include <xml/dom/xmlengserializationoptions.h> // needed for TSerializationOptions
+#include <xmlengserializationoptions.h> // needed for TSerializationOptions
 
 
 EXPORT_C CSenDomFragmentBase* CSenDomFragmentBase::NewL()
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wsfragment/src/senfragmentbase.cpp
--- a/webservices/wsfragment/src/senfragmentbase.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wsfragment/src/senfragmentbase.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -34,9 +34,9 @@
 
 #include <xml/attribute.h>               // needed for RAttributeArray
 #include <xml/parserfeature.h>           // for TParserFeature enumeration
-#include <xml/dom/xmlengserializationoptions.h> // for TSerializationOptions
-#include <xml/dom/xmlengbinarycontainer.h>
-#include <xml/dom/xmlengnodelist.h>
+#include <xmlengserializationoptions.h> // for TSerializationOptions
+#include <xmlengbinarycontainer.h>
+#include <xmlengnodelist.h>
 
 
 typedef unsigned char xmlChar; // from "libxml/Libxml2_xmlstring.h"
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wsfragment/src/wslibxml2utils.cpp
--- a/webservices/wsfragment/src/wslibxml2utils.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wsfragment/src/wslibxml2utils.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -24,10 +24,10 @@
 
 #include "wslibxml2utils.h"
 
-#include <stdapis/libxml2/libxml2_globals.h>
-#include <xml/dom/xmlengelement.h>
-#include <xml/dom/xmlengerrors.h>
-#include <xml/utils/xmlengxestd.h>
+#include <libxml2_globals.h>
+#include <xmlengelement.h>
+#include <xmlengerrors.h>
+#include <xmlengxestd.h>
 
 #define INTERNAL_NODEPTR(aNodeObject)   (*reinterpret_cast<xmlNodePtr*>(&(aNodeObject)))
 #define INTERNAL_NSPTR(aNsDefObject)    (*reinterpret_cast<xmlNsPtr*>(&(aNsDefObject)))
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wsframework/inc/senmtomutils.h
--- a/webservices/wsframework/inc/senmtomutils.h	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wsframework/inc/senmtomutils.h	Wed Sep 01 12:28:05 2010 +0100
@@ -27,11 +27,11 @@
 #include <SenSoapEnvelope2.h>
 #include <RSenDocument.h>
 
-#include <xml/dom/xmlengserializer.h>
-#include <xml/dom/xmlengchunkcontainer.h>
-#include <xml/dom/xmlengfilecontainer.h>
-#include <xml/dom/xmlengbinarycontainer.h>
-#include <xml/dom/xmlengnodelist.h>
+#include <xmlengserializer.h>
+#include <xmlengchunkcontainer.h>
+#include <xmlengfilecontainer.h>
+#include <xmlengbinarycontainer.h>
+#include <xmlengnodelist.h>
 
 // CONSTANTS
 _LIT(KMtomNoRequestSoapEnvelopePanicText, "NULL MTOM request soap envelope");
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wsframework/inc/senmultipartutils.h
--- a/webservices/wsframework/inc/senmultipartutils.h	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wsframework/inc/senmultipartutils.h	Wed Sep 01 12:28:05 2010 +0100
@@ -32,11 +32,11 @@
 #include "senatomentry.h"
 #include <RSenDocument.h>
 
-#include <xml/dom/xmlengserializer.h>
-#include <xml/dom/xmlengchunkcontainer.h>
-#include <xml/dom/xmlengfilecontainer.h>
-#include <xml/dom/xmlengbinarycontainer.h>
-#include <xml/dom/xmlengnodelist.h>
+#include <xmlengserializer.h>
+#include <xmlengchunkcontainer.h>
+#include <xmlengfilecontainer.h>
+#include <xmlengbinarycontainer.h>
+#include <xmlengnodelist.h>
 
 // CONSTANTS
 _LIT(KMultiPartNoRequestMessagePanicText, "NULL MultiPart request message");
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wsframework/inc/senwebservicesession.h
--- a/webservices/wsframework/inc/senwebservicesession.h	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wsframework/inc/senwebservicesession.h	Wed Sep 01 12:28:05 2010 +0100
@@ -293,7 +293,6 @@
 
          // Data, which also subclasses can access
         TTime iValidUntil;
-        TTime iMaxTime;
         
         RSenCredentialPtr  iCredentialPtr;
         HBufC8* iTransportCue; 
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wsframework/src/sencontextitem.cpp
--- a/webservices/wsframework/src/sencontextitem.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wsframework/src/sencontextitem.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -107,7 +107,6 @@
                     ipData = NULL;
                     }
                 }
-                break;
             case ECSenWSDescription:
                 {
                 CSenWSDescription* p = (CSenWSDescription*) ipData;
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wsframework/src/senmessagecontext.cpp
--- a/webservices/wsframework/src/senmessagecontext.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wsframework/src/senmessagecontext.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -397,7 +397,6 @@
     CSenContextItem* pItem = MessageToItem( apMessage, aOwned, leaveCode );
     if( leaveCode != KErrNone ) 
         {
-         delete pItem;	
         return leaveCode;
         }
 
@@ -416,7 +415,6 @@
     CSenContextItem* pItem = MessageToItem( apMessage, aOwned, leaveCode );
     if( leaveCode != KErrNone ) 
         {
-        	delete pItem;
         return leaveCode;
         }
 
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wsframework/src/senwebservicesession.cpp
--- a/webservices/wsframework/src/senwebservicesession.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wsframework/src/senwebservicesession.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -39,7 +39,7 @@
 #include "senservicepolicy.h"
 #include "seninternalcredential.h"
 #include "sensaxutils.h"
-#include <xml/dom/xmlengnodelist.h>
+#include <xmlengnodelist.h>
 #include <SenIdentityProvider.h>
 #include "senlogger.h"
 #include <SenXmlConstants.h>
@@ -98,7 +98,6 @@
     // Init member variables
     iClientServerInterval = 0;
     iValidUntil = Time::NullTTime();
-    iMaxTime = Time::NullTTime();;
     iFrameworkId = iFramework.Id().AllocL();
     }
 
@@ -1554,12 +1553,9 @@
         }
     else
         {
-        //const TTime& MAX_TIME = Time::MaxTTime();
-        //return MAX_TIME; // if no expiration was set, the session is
+        const TTime& MAX_TIME = Time::MaxTTime();
+        return MAX_TIME; // if no expiration was set, the session is
                          // valid forever(!)
-         iMaxTime = Time::MaxTTime();
-         return iMaxTime;             
-                         
         }
     }
 
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wshttpchanneltransportplugin/src/senhttpchannelimpl.cpp
--- a/webservices/wshttpchanneltransportplugin/src/senhttpchannelimpl.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wshttpchanneltransportplugin/src/senhttpchannelimpl.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -200,7 +200,7 @@
     iSess.StringPool().OpenL(HttpFilterCommonStringsExt::GetLanguageTable());
     iSess.StringPool().OpenL(HttpFilterCommonStringsExt::GetTable());
 	TLSLOG(KSenHttpChannelLogChannelBase , KMinLogLevel,(_L("CSenHttpChannelImpl::ConstructL() - Installing  HTTPAcceptProxyFilter for EKA2 build.")));
-    //CHttpFilterAcceptHeaderInterface::InstallFilterL(iSess); //There is issue with installing this filter. so disabling it temporarly
+    CHttpFilterAcceptHeaderInterface::InstallFilterL(iSess);
     TLSLOG(KSenHttpChannelLogChannelBase , KMinLogLevel,(_L("CSenHttpChannelImpl::ConstructL() - HTTPAcceptProxyFilter installed for EKA2 build.")));
   //#else
   //  LOG_WRITE_L("HTTPProxyFilter is NOT in use with EKA2 debug builds.");
@@ -1274,6 +1274,7 @@
         iSessionAuthentication = iManager.IdentityProviderL(aURI.UriDes());
         if(!iSessionAuthentication)
             {
+            TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel,"--- create and register new IDP"); 
             // create and register new IDP
             iSessionAuthentication = CSenIdentityProvider::NewL(aURI.UriDes(),
                                                                 KNullDesC8);
@@ -1287,13 +1288,15 @@
                 TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel,"GetCredentialsL() returning EFalse");
                 return EFalse; // decision: we could not save info into database, abort
                 }
-            TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel,"New IDP registeration OK. Proceeding.");
+            TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel,"--- New IDP registeration OK. Proceeding.");
             }
         // we have credentials
+       TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel,"--- we have credentials");         
         TRAPD(err, aUsername = 
             aRealm.Pool().OpenStringL(iSessionAuthentication->AuthzID()));
         TRAP(err, aPassword = 
             aRealm.Pool().OpenStringL(iSessionAuthentication->Password()));
+		TLSLOG_FORMAT((KSenHttpChannelLogChannelBase , KMinLogLevel, _L8("--- username (%s), password (%d)"), aUsername, aPassword));
         TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel,"GetCredentialsL() returning ETrue");
         return ETrue;
         }
@@ -1307,7 +1310,7 @@
         TPckgBuf<TSenAuthentication> authInfo;
         iManager.AuthenticationForL(*iSessionAuthentication, authInfo);
         iPasswordFromUser = ETrue;
-
+        TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel,"--- AuthenticationForL Called");
         TRAPD(err, aUsername = 
                 aRealm.Pool().OpenStringL(authInfo().iUsername));
         TRAP(err, aPassword = 
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wshttpchanneltransportplugin/src/senhttpchanneltransportplugin.cpp
--- a/webservices/wshttpchanneltransportplugin/src/senhttpchanneltransportplugin.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wshttpchanneltransportplugin/src/senhttpchanneltransportplugin.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -48,9 +48,9 @@
 #include "senservicesession.h"
 #include "senlogger.h"
 #include "senclientsession.h"
-#include <xml/dom/xmlengchunkcontainer.h>
-#include <xml/dom/xmlengfilecontainer.h>
-#include <xml/dom/xmlengserializer.h>
+#include <xmlengchunkcontainer.h>
+#include <xmlengfilecontainer.h>
+#include <xmlengserializer.h>
 
 
 
@@ -482,7 +482,10 @@
     	{
     	iHttpChannel->SetExplicitIapDefined(ETrue);
     	}	
+    if(iHttpChannel)
+    	{
     	iHttpChannel->DisableTimeOutL(aRequestId);
+    	}
 #ifdef _SENDEBUG    
     TLSLOG_FORMAT((KSenHttpChannelObserverLogChannelBase,KNormalLogLevel, _L8("- Request's txnID: %d"), aRequestId));
     if ( apErrorBody )
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wsidentitymanager/inc/senbaseidentitymanager.h
--- a/webservices/wsidentitymanager/inc/senbaseidentitymanager.h	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wsidentitymanager/inc/senbaseidentitymanager.h	Wed Sep 01 12:28:05 2010 +0100
@@ -306,7 +306,7 @@
         */
         virtual TInt WriteConfigurationToL( const TDesC& aFile );
         TBool AllowSavePasswordL();
-        /** Improved heuristics from Identity DB removal / cleanups : Naga
+        /** Improved heuristics from Identity DB removal / cleanups
 	    *
 	    * Checks touch attribute value for all IdentityProvider child elements of 
 	    * current Identity element if that exceeds the the tick counts for two weeks 
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wsidentitymanager/src/senbaseidentitymanager.cpp
--- a/webservices/wsidentitymanager/src/senbaseidentitymanager.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wsidentitymanager/src/senbaseidentitymanager.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -567,8 +567,7 @@
             TLSLOG_FORMAT((KSenCoreServiceManagerLogChannelBase  , KMinLogLevel, _L8("Username: %S"), pUsernameUtf8));
             TLSLOG_FORMAT((KSenCoreServiceManagerLogChannelBase  , KMinLogLevel, _L8("Password: %S"), pPasswordUtf8 ));
             HBufC8* pEncodedUsername = NULL;
-            illegalUsername = 
-                SenXmlUtils::EncodeHttpCharactersL(*pUsernameUtf8,
+            illegalUsername = SenXmlUtils::EncodeHttpCharactersL(*pUsernameUtf8,
                                                     pEncodedUsername);
             if (illegalUsername) 
                 {
@@ -617,7 +616,7 @@
 	                    // if advisory was changed in service (is no longer
 	                    // valid), there would NOT be any way for end-user
 	                    // to change (remove) it(!)
-
+						TLSLOG_L(KSenCoreServiceManagerLogChannelBase  , KMinLogLevel,"There was at least AuthzID available");
 	                    CSenElement& element = aProvider.AsElement();
 	                    delete element.RemoveElement(KSenIdpAdvisoryAuthnIdLocalname);
 
@@ -654,14 +653,32 @@
             aResponse().iPassword.Zero();
             if (!illegalUsername) 
             {
-	            aResponse().iUsername.Copy(pUsernameUtf8->Des());
-	            aResponse().iPassword.Copy(pPasswordUtf8->Des());
+                   TLSLOG(KSenCoreServiceManagerLogChannelBase  , KMinLogLevel,(_L("NOT illegalUsername")));
+			if(pUsernameUtf8)
+				{
+				TLSLOG_FORMAT((KSenCoreServiceManagerLogChannelBase  , KMinLogLevel, _L8(" pUsernameUtf8 Length is %d"),  pUsernameUtf8->Length()));
+				if(pUsernameUtf8->Length() > 0 && pUsernameUtf8->Length() <= KSenAuthMaxUsernameLength)
+					{
+					TLSLOG(KSenCoreServiceManagerLogChannelBase  , KMinLogLevel,(_L("Copy username")));
+					aResponse().iUsername.Copy(pUsernameUtf8->Des());
+					}
+				}
+			if(pPasswordUtf8)
+				{
+				TLSLOG_FORMAT((KSenCoreServiceManagerLogChannelBase  , KMinLogLevel, _L8(" pPasswordUtf8 Length is %d"),  pPasswordUtf8->Length()));
+				if(pPasswordUtf8->Length() > 0 && pPasswordUtf8->Length() <= KSenAuthMaxPasswordLength)				
+					{
+					TLSLOG(KSenCoreServiceManagerLogChannelBase  , KMinLogLevel,(_L("Copy password")));
+			            	aResponse().iPassword.Copy(pPasswordUtf8->Des());
+					}
+				}
             }
-
             CleanupStack::PopAndDestroy(2); // pPasswordUtf8, pUsernameUtf8
             }
         else
             {
+		     aResponse().iUsername.Zero();
+            aResponse().iPassword.Zero();            
             TLSLOG(KSenCoreServiceManagerLogChannelBase  , KMinLogLevel,(_L("User pressed Cancel Button in Password dialog")));
             }
         }
@@ -671,8 +688,7 @@
         }
     else
         {
-        TLSLOG_FORMAT((KSenCoreServiceManagerLogChannelBase  , KMinLogLevel, _L8(" Notifier plugin for 'Password' dialog returned an error: %d"), 
-                                                        reqStatus.Int()));
+        TLSLOG_FORMAT((KSenCoreServiceManagerLogChannelBase  , KMinLogLevel, _L8(" Notifier plugin for 'Password' dialog returned an error: %d"),  reqStatus.Int()));
         }
 
     CleanupStack::PopAndDestroy(2); // request, response;
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wsmessages/src/senatomentry.cpp
--- a/webservices/wsmessages/src/senatomentry.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wsmessages/src/senatomentry.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -27,7 +27,7 @@
 #include <badesca.h>
 
 #include <SenDomFragmentBase.h>
-#include <xml/dom/xmlengnodelist.h>
+#include <xmlengnodelist.h>
 
 #include "senatomentry.h"
 
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wsmessages/src/senatomfeed.cpp
--- a/webservices/wsmessages/src/senatomfeed.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wsmessages/src/senatomfeed.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -25,7 +25,7 @@
 #include <badesca.h>
 
 #include <SenDomFragmentBase.h>
-#include <xml/dom/xmlengnodelist.h>
+#include <xmlengnodelist.h>
 
 #include "senatomfeed.h"
 #include "senatomentry.h"
@@ -113,7 +113,7 @@
     //from table
     for (TInt aIndex = 0; aIndex < iEntries.Count(); aIndex++ )
         {
-       // const TDesC8& tmp = iEntries[aIndex]->IdTag();//delete this
+        const TDesC8& tmp = iEntries[aIndex]->IdTag();//delete this
         if(aEntryId.Compare(iEntries[aIndex]->IdTag())==0)
             {
             delete iEntries[aIndex];
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wsmessages/src/senatommessage.cpp
--- a/webservices/wsmessages/src/senatommessage.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wsmessages/src/senatommessage.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -32,7 +32,7 @@
 
 #include "sendebug.h"
 #include "senlogger.h"
-#include <xml/dom/xmlengnodelist.h>
+#include <xmlengnodelist.h>
 
 CSenAtomMessage::CSenAtomMessage() 
 //:iTitle(NULL), iId(NULL), iUpdated(NULL), iPublished(NULL)
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wsmessages/src/sensoapenvelope2.cpp
--- a/webservices/wsmessages/src/sensoapenvelope2.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wsmessages/src/sensoapenvelope2.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -27,7 +27,7 @@
 
 #include <SenXmlUtils.h>
 #include <SenDomFragmentBase.h>
-#include <xml/dom/xmlengnodelist.h>
+#include <xmlengnodelist.h>
 
 
 #include "SenSoapEnvelope2.h"
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wsmessages/src/sensoapfault2.cpp
--- a/webservices/wsmessages/src/sensoapfault2.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wsmessages/src/sensoapfault2.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -95,7 +95,7 @@
 #include "SenSoapFault2.h"
 #include "SenSoapEnvelope2.h"
 
-#include <xml/dom/xmlengnodelist.h>
+#include <xmlengnodelist.h>
 
 EXPORT_C CSenSoapFault2* CSenSoapFault2::NewL(
                                         const TDesC8& aNsUri,
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wsmessages/src/sensoapmessage2.cpp
--- a/webservices/wsmessages/src/sensoapmessage2.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wsmessages/src/sensoapmessage2.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -23,7 +23,7 @@
 
 
 // INCLUDE FILES
-#include <xml/dom/xmlengnodelist.h>
+#include <xmlengnodelist.h>
 #include <badesca.h>
 #include <SenXmlReader.h>
 #include <s32mem.h>
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wsmessages/src/sensoapmessagedom2.cpp
--- a/webservices/wsmessages/src/sensoapmessagedom2.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wsmessages/src/sensoapmessagedom2.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -27,7 +27,7 @@
 #include <SenXmlReader.h>
 #include <s32mem.h>
 #include <utf.h>
-#include <xml/dom/xmlengbinarycontainer.h>
+#include <xmlengbinarycontainer.h>
 
 #include "SenWsSecurityHeader2.h"
 #include "sensoapmessagedom2.h"
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wsmessages/src/senwssecurityheader2.cpp
--- a/webservices/wsmessages/src/senwssecurityheader2.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wsmessages/src/senwssecurityheader2.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -24,7 +24,7 @@
 
 // INCLUDE FILES
 #include <SenIdentityProvider.h>
-#include <xml/dom/xmlengbinarycontainer.h>
+#include <xmlengbinarycontainer.h>
 
 #include "SenWsSecurityHeader2.h"
 #include "sendebug.h"
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wsoviplugin/inc/wsovicons.h
--- a/webservices/wsoviplugin/inc/wsovicons.h	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wsoviplugin/inc/wsovicons.h	Wed Sep 01 12:28:05 2010 +0100
@@ -199,11 +199,12 @@
     _LIT8(KErrorText,                    "errorText");
     _LIT8(KErrorCodeInvalidAccessToken, "invalidAccessToken");
     _LIT8(KErrorCodeUnauthorized,       "notAuthorized");
+
     _LIT8(KUserInfoLocalName,"userInfo");
     _LIT8(KUserNameLocalName,"username");
-		_LIT8( KMobileUsed1,             "Mobile number" );
+	_LIT8( KMobileUsed1,             "Mobile number" );
     _LIT8( KMobileUsed2,             "already used today" );
-		_LIT8(KEmailUsed, "You have already a Nokia account associated with this mobile number or email address.");	
+	_LIT8(KEmailUsed, "You have already a Nokia account associated with this mobile number or email address.");
 	}
 
 #endif // CONSPLUGIN_H
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wsoviplugin/inc/wsovioauthclient.h
--- a/webservices/wsoviplugin/inc/wsovioauthclient.h	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wsoviplugin/inc/wsovioauthclient.h	Wed Sep 01 12:28:05 2010 +0100
@@ -118,7 +118,7 @@
     void SetHandlerCtx(MSenHandlerContext* aHndCtx);
     
     TBool HasSuperClass( TDescriptionClassType aType );
-    void CreateBodyL(const TDesC8& aXmlNs, const TDesC8& aUsername, const TDesC8& aPassword, const TDesC8& aCreated);
+    void CreateBodyL(const TDesC8& aXmlNs, const TDesC8& aUsername, const TDesC8& aPassword, const TDesC8& aCreated, const TDesC8& aValidator=KNullDesC8);
         
 protected://methods
     
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wsoviplugin/inc/wsoviservicesession.h
--- a/webservices/wsoviplugin/inc/wsoviservicesession.h	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wsoviplugin/inc/wsoviservicesession.h	Wed Sep 01 12:28:05 2010 +0100
@@ -32,9 +32,9 @@
 #include "wsoviplugin.h"
 #include "senwebservicesession.h"
 #include "wsovisessionconsumer.h"
-#include <xml/dom/xmlengfilecontainer.h>
-#include <xml/dom/xmlengchunkcontainer.h>
-#include <xml/dom/xmlengelement.h>
+#include <xmlengfilecontainer.h>
+#include <xmlengchunkcontainer.h>
+#include <xmlengelement.h>
 
 class CWSOviCredentialObserver;
 class CSenHttpTransportProperties;
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wsoviplugin/inc/wsoviutils.h
--- a/webservices/wsoviplugin/inc/wsoviutils.h	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wsoviplugin/inc/wsoviutils.h	Wed Sep 01 12:28:05 2010 +0100
@@ -46,10 +46,10 @@
                 
         // New functions
 		static HBufC8* NormalizeStringLC(const TDesC8& aMethod, const TDesC8& aUrl, const TDesC8& aHeader );
-		static HBufC8* DigestAuthStringL(const TDesC8& aNonce, const TDesC8& aTimestamp, const TDesC8& aUser, const TDesC8& aPassword);
+		static HBufC8* DigestAuthStringL(const TDesC8& aNonce, const TDesC8& aTimestamp, const TDesC8& aUser, const TDesC8& aPassword, const TDesC8& aValidator = KNullDesC8);
         static HBufC8* EncodeCharsLC(const TDesC8& aString);
         static HBufC8* FormEncodeCharsLC(const TDesC8& aString);
-
+        static HBufC8* GenerateValidatorL(const TDesC8& aUser, const TDesC8& aPassword);
     private:
 
 		~CWSOviUtils();       
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wsoviplugin/src/wsovioauthclient.cpp
--- a/webservices/wsoviplugin/src/wsovioauthclient.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wsoviplugin/src/wsovioauthclient.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -231,15 +231,33 @@
         
         TPtrC8 userName(KNullDesC8);
         TPtrC8 password(KNullDesC8);
+		TPtrC8 validator(KNullDesC8);
         if ( authenticationInfoPromptedFromUser )
             {
+		     TLSLOG_L(KSenCoreServiceManagerLogChannelBase  , KMinLogLevel," --- Setting username/password from authenticationInfoPromptedFromUser");
             userName.Set(authInfo().iUsername);
             password.Set(authInfo().iPassword);
             }
         else
             {
+		     TLSLOG_L(KSenCoreServiceManagerLogChannelBase  , KMinLogLevel," --- Setting username/password from IDP");
             userName.Set(iIdentityProvider->UserName());
             password.Set(iIdentityProvider->Password());
+
+			/* Below code will be required when we need to get validator from IDP but Now Crashes */
+			/*CSenElement* validatorTag(NULL);
+			if (iIdentityProvider->FrameworkId() == KDefaultOviFrameworkID)
+				{
+				CSenElement* el( NULL );
+				iIdentityProvider->AccountExtensions( el );
+				if (el)
+					{
+					_LIT8(KWSAccAttrAccountValidator,      "Validator");
+					validatorTag = el->Element(KWSAccAttrAccountValidator);
+					validator.Set(validatorTag->Content());
+				        TLSLOG_L(KSenCoreServiceManagerLogChannelBase  , KMinLogLevel,"CWSOviOAuthClient::ValidateL() - NCIM Valiadtor read successfully");
+					}
+				}*/
             }
         HBufC8* created(NULL);
         //CWSOviSessionContext* sessioncontext = iWSOviServiceSession->SessionContext();
@@ -259,7 +277,8 @@
         CreateBodyL(*version,
                     userName,
                     password,
-					*created);
+			*created/*,
+			validator*/);
         CleanupStack::PopAndDestroy(created);
 
         
@@ -372,10 +391,12 @@
             time -= TTimeIntervalMicroSeconds(diff.Int64());
             HBufC8* created = SenCryptoUtils::GetTimestampL(time);
             CleanupStack::PushL(created);
+							
             CreateBodyL(*version,
                         userName,
                         password,
-                        *created);
+                        *created/*,
+			validator*/);
             CleanupStack::PopAndDestroy(created);
             retVal = iAuthSession->SubmitL(*iBody, *transPropAsXml, *this, response);
             aSession.SetTransportL(ipTransport);//ownership moved
@@ -733,7 +754,7 @@
     return retVal; 
     }
 
-void CWSOviOAuthClient::CreateBodyL(const TDesC8& aXmlNs, const TDesC8& aUsername, const TDesC8& aPassword, const TDesC8& aCreated)
+void CWSOviOAuthClient::CreateBodyL(const TDesC8& aXmlNs, const TDesC8& aUsername, const TDesC8& aPassword, const TDesC8& aCreated, const TDesC8& aValidator)
     {
     if(aPassword == KNullDesC8())
     	{
@@ -744,7 +765,8 @@
     HBufC8* nonce = SenCryptoUtils::GetRandomNonceL();
     CleanupStack::PushL(nonce);
     HBufC8* passDec = SenXmlUtils::DecodeHttpCharactersLC( aPassword );
-    HBufC8* digest = CWSOviUtils::DigestAuthStringL(*nonce, aCreated, aUsername, *passDec);
+	HBufC8* digest = CWSOviUtils::DigestAuthStringL(*nonce, aCreated, aUsername, *passDec, aValidator);
+
     CleanupStack::PopAndDestroy(passDec);
     CleanupStack::PushL(digest);
                     
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wsoviplugin/src/wsoviplugin.cpp
--- a/webservices/wsoviplugin/src/wsoviplugin.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wsoviplugin/src/wsoviplugin.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -336,6 +336,7 @@
         case KSenEventWsfReady:
             {
             TPtrC8 imsi = iManager.IMSI();
+			//On SIM Change below code resets the KSenAccAutoSignIn flag			
             if (iIMSI.Compare(imsi))
             	{
             	const RPointerArray<CSenIdentityProvider> list = iManager.IdentityProvidersL();
@@ -346,6 +347,8 @@
     	            if (el)
     	            	{
     	            	delete (el->RemoveElement(KSenAccAutoSignIn));
+						_LIT8(KWSAccAttrAccountValidator,      "Validator");
+    	            	delete (el->RemoveElement(KWSAccAttrAccountValidator));
     	            	((MSenCredentialManager&)iManager).RemoveCredentialsL(list[i]->ProviderID());
     	            	}
     	            //((MSenCredentialManager&)iManager).RemoveCredentialsL(list[i]->ProviderID());
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wsoviplugin/src/wsoviservicesession.cpp
--- a/webservices/wsoviplugin/src/wsoviservicesession.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wsoviplugin/src/wsoviservicesession.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -30,7 +30,7 @@
 #include "sendebug.h"
 #include "senwspattern.h"
 #include "SenXmlUtils.h"
-#include <xml/dom/xmlengnodelist.h> 
+#include <xmlengnodelist.h> 
 #include <SenHttpTransportProperties.h>
 #include <SenIdentityProvider.h>
 #include "wsovicredentialobserver.h"
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wsoviplugin/src/wsoviserviceupdatehandler.cpp
--- a/webservices/wsoviplugin/src/wsoviserviceupdatehandler.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wsoviplugin/src/wsoviserviceupdatehandler.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -142,9 +142,9 @@
 						pCtx.Add(WSOviContextKeys::KServiceSession, *(MSenRemoteServiceSession*)remoteServiceSession);
 						}
 					if( ! errFragment->Text().Compare(WSOviResponse::KEmailUsed()) ||
-					  (errFragment->Text().Compare(WSOviResponse::KMobileUsed1)!= KErrNotFound &&
-					   errFragment->Text().Compare(WSOviResponse::KMobileUsed2) != KErrNotFound )
-					  )
+					       (errFragment->Text().Compare(WSOviResponse::KMobileUsed1)!= KErrNotFound &&
+					        errFragment->Text().Compare(WSOviResponse::KMobileUsed2) != KErrNotFound )
+					    )
 					    {
 					    pCtx.Update(WSOviContextKeys::KRetryNeeded, EFalse);
 					    }
@@ -152,6 +152,7 @@
 					    {
 					    pCtx.Update(WSOviContextKeys::KReAuthNeeded, ETrue);
 					    }
+					
 					oviServiceSession->ClearCredentialL();
 					oviServiceSession->SetStatusL();//in order to compute state
 				}
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wsoviplugin/src/wsoviutils.cpp
--- a/webservices/wsoviplugin/src/wsoviutils.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wsoviplugin/src/wsoviutils.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -84,7 +84,7 @@
 	return pNormalizedString;
 	}
 
-HBufC8* CWSOviUtils::DigestAuthStringL(const TDesC8& aNonce, const TDesC8& aTimestamp, const TDesC8& aUser, const TDesC8& aPassword)
+HBufC8* CWSOviUtils::GenerateValidatorL(const TDesC8& aUser, const TDesC8& aPassword)
 	{
 	_LIT8(KFormatUser, "/accounts/%S/");
 	HBufC8* validatorString = HBufC8::NewLC(KFormatUser().Length()+aUser.Length());
@@ -93,17 +93,40 @@
 	CSHA1* sha1 = CSHA1::NewL();
 	sha1->Update(*validatorString);
 	TPtrC8 validator = sha1->Final(aPassword);
-	CleanupStack::PopAndDestroy(validatorString);
+	CleanupStack::PopAndDestroy(validatorString);		
 	CleanupStack::PushL(sha1);
 	HBufC8* base64validator = SenCryptoUtils::EncodeBase64L(validator);
-	sha1->Reset();
-	sha1->Update(aNonce);
-	sha1->Update(aTimestamp);
-	TPtrC8 digest = sha1->Final(*base64validator);
-	delete base64validator;
-	HBufC8* digestBase64 = SenCryptoUtils::EncodeBase64L(digest);
 	CleanupStack::PopAndDestroy(sha1);
-	return digestBase64;
+	return base64validator;
+	}
+
+HBufC8* CWSOviUtils::DigestAuthStringL(const TDesC8& aNonce, const TDesC8& aTimestamp, const TDesC8& aUser, const TDesC8& aPassword, const TDesC8& aValidator )
+	{
+	if ( aValidator == KNullDesC8 )
+		{
+		CSHA1* sha1 = CSHA1::NewL();
+		CleanupStack::PushL(sha1);
+		HBufC8* base64validator = GenerateValidatorL(aUser, aPassword);
+		//sha1->Reset();
+		sha1->Update(aNonce);
+		sha1->Update(aTimestamp);
+		TPtrC8 digest = sha1->Final(*base64validator);
+		delete base64validator;
+		HBufC8* digestBase64 = SenCryptoUtils::EncodeBase64L(digest);
+		CleanupStack::PopAndDestroy(sha1);
+		return digestBase64;
+		}
+	else
+		{
+		CSHA1* sha1 = CSHA1::NewL();
+		CleanupStack::PushL(sha1);
+		sha1->Update(aNonce);
+		sha1->Update(aTimestamp);		
+		TPtrC8 digest = sha1->Final(aValidator);
+		HBufC8* digestBase64 = SenCryptoUtils::EncodeBase64L(digest);
+		CleanupStack::PopAndDestroy(sha1);
+		return digestBase64;
+		}
 	}
 
 
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wsstar/wsstarmessagehandlers/src/wsstaraddressinghandler.cpp
--- a/webservices/wsstar/wsstarmessagehandlers/src/wsstaraddressinghandler.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wsstar/wsstarmessagehandlers/src/wsstaraddressinghandler.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -225,7 +225,7 @@
     CSenElement* ppElem = CWSStarMessageUtils::FindElementL(Kpp, header);
     if(ppElem)
         {
-        CSenElement* credPropertiesElem = CWSStarMessageUtils::FindElementL(KCredProperties, *ppElem);//Naga
+        CSenElement* credPropertiesElem = CWSStarMessageUtils::FindElementL(KCredProperties, *ppElem);
         if(credPropertiesElem)
             {
             CWSStarMessageUtils::FindElementL(KCredProperty, *credPropertiesElem, credPropertiesElements);
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wsstar/wsstarmessagehandlers/src/wsstarmessageutils.cpp
--- a/webservices/wsstar/wsstarmessagehandlers/src/wsstarmessageutils.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wsstar/wsstarmessagehandlers/src/wsstarmessageutils.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -25,7 +25,7 @@
 
 
 #include "wsstarmessageutils.h"
-#include <xml/dom/xmlengnodelist.h> 
+#include <xmlengnodelist.h> 
 
 CSenElement* CWSStarMessageUtils::GetMarkedElementL(CSenElement& aParent, 
                                                     const TDesC8& aValue, TBool aAttribute)
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wsstar/wsstarplugin/inc/wsstarservicesession.h
--- a/webservices/wsstar/wsstarplugin/inc/wsstarservicesession.h	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wsstar/wsstarplugin/inc/wsstarservicesession.h	Wed Sep 01 12:28:05 2010 +0100
@@ -35,9 +35,9 @@
 #include "wsstarplugin.h"
 #include "senwebservicesession.h"
 #include "wsstarsessionconsumer.h"
-#include <xml/dom/xmlengfilecontainer.h>
-#include <xml/dom/xmlengchunkcontainer.h>
-#include <xml/dom/xmlengelement.h>
+#include <xmlengfilecontainer.h>
+#include <xmlengchunkcontainer.h>
+#include <xmlengelement.h>
 #include "sensoapmessagedom2.h"
 
 class CWSStarCredentialObserver;
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wsstar/wsstarplugin/src/wsstarservicesession.cpp
--- a/webservices/wsstar/wsstarplugin/src/wsstarservicesession.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wsstar/wsstarplugin/src/wsstarservicesession.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -33,7 +33,7 @@
 #include "sencryptoutils.h"
 #include "senwspattern.h"
 #include "SenXmlUtils.h"
-#include <xml/dom/xmlengnodelist.h> 
+#include <xmlengnodelist.h> 
 
 #include <SenIdentityProvider.h>
 #include "wsstarcredentialobserver.h"
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wsstar/wsstarpolicy/src/seninternalwspolicy.cpp
--- a/webservices/wsstar/wsstarpolicy/src/seninternalwspolicy.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wsstar/wsstarpolicy/src/seninternalwspolicy.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -40,7 +40,7 @@
     //#include "Attribute.h"
 #endif
 
-#include <xml/dom/xmlengnodelist.h> 
+#include <xmlengnodelist.h> 
 using namespace Xml;
 using namespace SenWSInternalPolicy;
 namespace
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wsstar/wsstarpolicy/src/senwspolicymanager.cpp
--- a/webservices/wsstar/wsstarpolicy/src/senwspolicymanager.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wsstar/wsstarpolicy/src/senwspolicymanager.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -46,7 +46,7 @@
 
 
 #include <SenServiceConnection.h> 
-#include <xml/dom/xmlengnodelist.h> 
+#include <xmlengnodelist.h> 
 using namespace WSPolicy;
 using namespace SenWSInternalPolicy;
 namespace
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wsstar/wsstarpolicy/src/wspolicy.cpp
--- a/webservices/wsstar/wsstarpolicy/src/wspolicy.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wsstar/wsstarpolicy/src/wspolicy.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -25,7 +25,7 @@
 // INCLUDE FILES
 #include "wspolicy.h"
 #include <f32file.h>
-#include <xml/dom/xmlengdom.h>
+#include <xmlengdom.h>
 #include <SenXmlUtils.h>
 #include "senguidgen.h"
 #include "SenXmlElement.h"
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wsutils/src/senpropertieselement.cpp
--- a/webservices/wsutils/src/senpropertieselement.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wsutils/src/senpropertieselement.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -332,10 +332,9 @@
             {
             CSenNamespace* pNamespace = sourceNamespaces[i];
             CSenNamespace* pNewNamespace =
-            CSenNamespace::NewL(pNamespace->Prefix(),pNamespace->URI());
-			CleanupStack::PushL(pNewNamespace);
+                CSenNamespace::NewL(pNamespace->Prefix(),pNamespace->URI());
+
             CSenXmlElement::AddNamespaceL(*pNewNamespace, EFalse);
-            CleanupStack::Pop(); 	
             }
         }
 
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wsxml/src/senbaseelement.cpp
--- a/webservices/wsxml/src/senbaseelement.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wsxml/src/senbaseelement.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -269,7 +269,9 @@
         CSenBaseAttribute* pAttribute = CSenBaseAttribute::NewL(aQName,
                                                                 aLocalName,
                                                                 aValue);
+        CleanupStack::PushL(pAttribute);
         AddAttributeL(pAttribute);
+        CleanupStack::Pop(pAttribute);
         }
     return aValue;
     }
@@ -487,8 +489,16 @@
     CSenBaseAttribute* pAttr = FindAttr(aName);
     if (pAttr == NULL)
         {
-        User::LeaveIfError(iAttrs.Append(CSenBaseAttribute::NewL(aName,
-                                                                 aValue)));
+        //Create new baseAttribute object
+        CSenBaseAttribute* newBaseAttribute = CSenBaseAttribute::NewL(aName, aValue);
+        //Push to cleanupstack 
+        CleanupStack::PushL(newBaseAttribute);
+        
+        //Add the new baseAttribute to existing Attribute list
+        User::LeaveIfError(iAttrs.Append(newBaseAttribute));
+        
+        //Pop from CleanupStack
+        CleanupStack::Pop(newBaseAttribute);
         }
     else
         {
@@ -632,7 +642,19 @@
 EXPORT_C CSenElement& CSenBaseElement::AddElementL(const TDesC8& aNsUri,
                                                    const TDesC8& aLocalName)
     {
-    return AddElementL(*CSenBaseElement::NewL(aNsUri, aLocalName));
+    //Create new baseElement
+    CSenBaseElement *newBaseElement = CSenBaseElement::NewL(aNsUri, aLocalName);
+    //Push it to CleanupStack
+    CleanupStack::PushL(newBaseElement);
+    
+    //Add the baseElement
+    CSenElement& newAddedElement  = AddElementL(*newBaseElement);
+    
+    //Pop baseElement from CleanupStack
+    CleanupStack::Pop(newBaseElement);
+    
+    //Return the newly added element (got from the AddElement() API)
+    return newAddedElement;
     }
 
 EXPORT_C CSenElement& CSenBaseElement::AddElementL(
@@ -641,12 +663,36 @@
     const TDesC8& aQName
     )
     {
-    return AddElementL(*CSenBaseElement::NewL(aNsUri, aLocalName, aQName));
+    //Create new baseElement
+    CSenBaseElement *newBaseElement = CSenBaseElement::NewL(aNsUri, aLocalName, aQName);
+    //Push it to CleanupStack
+    CleanupStack::PushL(newBaseElement);
+
+    //Add the baseElement
+    CSenElement& newAddedElement  =  AddElementL(*newBaseElement);
+    
+    //Pop baseElement from CleanupStack
+    CleanupStack::Pop(newBaseElement);
+        
+    //Return the newly added element (got from the AddElement() API)
+    return newAddedElement;
     }
 
 EXPORT_C CSenElement& CSenBaseElement::AddElementL(const TDesC8& aLocalName)
     {
-    return AddElementL(*CSenBaseElement::NewL(aLocalName));
+    //Create new baseElement
+    CSenBaseElement *newBaseElement = CSenBaseElement::NewL(aLocalName);
+    //Push it to CleanupStack
+    CleanupStack::PushL(newBaseElement);
+    
+    //Add the baseElement
+    CSenElement& newAddedElement  =  AddElementL(*newBaseElement);
+    
+    //Pop baseElement from CleanupStack
+    CleanupStack::Pop(newBaseElement);
+       
+    //Return the newly added element (got from the AddElement() API)
+    return newAddedElement;
     }
 
 EXPORT_C CSenElement* CSenBaseElement::RemoveElement(CSenElement& aElement)
diff -r c5fabff9b552 -r 1adb97a15c2f webservices/wsxml/src/senxmlelement.cpp
--- a/webservices/wsxml/src/senxmlelement.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wsxml/src/senxmlelement.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -1232,14 +1232,13 @@
     if (pNamespace == NULL) // does not exist
         {
         CSenNamespace* pNewNamespace =
-        CSenNamespace::NewL(aNewNamespace.Prefix(), aNewNamespace.URI());
-		CleanupStack::PushL(pNewNamespace); 
+            CSenNamespace::NewL(aNewNamespace.Prefix(), aNewNamespace.URI());
+
         // allocate array if not already reserved
         if(!ipNamespaces)
             {
             ipNamespaces = new (ELeave) RPointerArray<CSenNamespace>;
             }
-        CleanupStack::Pop();			
         ipNamespaces->Append(pNewNamespace);
         pNamespace = pNewNamespace;
         }
@@ -1255,14 +1254,12 @@
 		{
 		if ( aUri.Length() > 0)
 			{
-			pNamespace = CSenNamespace::NewL(aPrefix, aUri);
-			CleanupStack::PushL(pNamespace); 
+				pNamespace = CSenNamespace::NewL(aPrefix, aUri);
 			// allocate array if not already reserved
 			if(!ipNamespaces)
 				{
 				ipNamespaces = new (ELeave) RPointerArray<CSenNamespace>;
 				}
-			 CleanupStack::Pop();				
 			ipNamespaces->Append(pNamespace);
 			}
 		}
diff -r c5fabff9b552 -r 1adb97a15c2f websrv_pub/hostlet_connection_api/tsrc/hostconnTester/group/hostconnTester.mmp
--- a/websrv_pub/hostlet_connection_api/tsrc/hostconnTester/group/hostconnTester.mmp	Tue Aug 31 16:18:26 2010 +0300
+++ b/websrv_pub/hostlet_connection_api/tsrc/hostconnTester/group/hostconnTester.mmp	Wed Sep 01 12:28:05 2010 +0100
@@ -33,6 +33,7 @@
 
 //USERINCLUDE             ../inc
 
+//SYSTEMINCLUDE           /epoc32/include
 SYSTEMINCLUDE       	/Epoc32/include/libc
 MW_LAYER_SYSTEMINCLUDE //SYSTEMINCLUDE
 
diff -r c5fabff9b552 -r 1adb97a15c2f websrv_pub/web_service_connection_api/tsrc/SenConnectionTimeoutsTester/src/SenConnectionTimeoutsTesterBlocks.cpp
--- a/websrv_pub/web_service_connection_api/tsrc/SenConnectionTimeoutsTester/src/SenConnectionTimeoutsTesterBlocks.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/websrv_pub/web_service_connection_api/tsrc/SenConnectionTimeoutsTester/src/SenConnectionTimeoutsTesterBlocks.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -44,9 +44,9 @@
 #include <SenDateUtils.h>
 #include <SenTransportProperties.h>
 
-#include <xml/dom/xmlengchunkcontainer.h>
-#include <xml/dom/xmlengfilecontainer.h>
-#include <xml/dom/xmlengserializer.h>
+#include <xmlengchunkcontainer.h>
+#include <xmlengfilecontainer.h>
+#include <xmlengserializer.h>
 
 #include <e32base.h> // for CActive
 #include <aknnotewrappers.h> 
diff -r c5fabff9b552 -r 1adb97a15c2f websrv_pub/web_service_connection_api/tsrc/bc/connection/sis/52_websrv_connection.pkg
--- a/websrv_pub/web_service_connection_api/tsrc/bc/connection/sis/52_websrv_connection.pkg	Tue Aug 31 16:18:26 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-;
-; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:        
-;
-; Languages
-; none -  English only by default
-&EN
-
-; Installation header
-; Only one component name as we only support English
-; UID is the main app's UID
-
-#{"WebServices Connection"},(0x20016BAA),3,0,0,TYPE=SA
-[0x101F7961],0,0,0,{"Series60ProductID"}
-
-; Non-localised vendor name
-:"Nokia Corporation"
-
-; Localised vendor names
-%{"Nokia Corporation"}
-
-
-; Files to install and to where
-"\Epoc32\Release\armv5\urel\CSenServiceConnectionBCTest.dll"-"!:\sys\bin\CSenServiceConnectionBCTest.dll"
-"\Epoc32\winscw\c\testSC_c.bat"-"!:\testSC.bat"
-"\Epoc32\winscw\c\testframework\testframework_connection.ini"-"!:\testframework\testframework_connection.ini"
\ No newline at end of file
diff -r c5fabff9b552 -r 1adb97a15c2f websrv_pub/web_service_connection_api/tsrc/bc/connection/sis/52_websrv_connection.sis
Binary file websrv_pub/web_service_connection_api/tsrc/bc/connection/sis/52_websrv_connection.sis has changed
diff -r c5fabff9b552 -r 1adb97a15c2f websrv_pub/web_service_connection_api/tsrc/bc/connection/src/senserviceconnectioncases.cpp
--- a/websrv_pub/web_service_connection_api/tsrc/bc/connection/src/senserviceconnectioncases.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/websrv_pub/web_service_connection_api/tsrc/bc/connection/src/senserviceconnectioncases.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -46,9 +46,9 @@
 
 //#include <SenVtcpTransportProperties.h>
 #include "testproperty.h"
-#include <xml/dom/xmlengchunkcontainer.h>
-#include <xml/dom/xmlengfilecontainer.h>
-//#include <xml/dom/xmlengserializer.h>
+#include <XmlEngChunkContainer.h>
+#include <XmlEngFileContainer.h>
+//#include <XmlEngSerializer.h>
 
 #include <e32base.h> // for CActive
 #include <aknnotewrappers.h> 
@@ -1830,7 +1830,7 @@
 	TInt err(KErrNone);
 
 	//iServiceConnection = CSenServiceConnection::NewL(*this, KAddressBookServiceId());
-	iServiceConnection = CSenServiceConnection::NewLC(*this, *iSenXmlServiceDescription);
+	iServiceConnection = CSenServiceConnection::NewL(*this, *iSenXmlServiceDescription);
 
 	StartActiveScheduler(1);
 	User::LeaveIfError(this->iFsSessionHandle.Connect());//anil
@@ -1857,7 +1857,7 @@
 	if(iFsSessionHandle.Handle())
     	iFsSessionHandle.Close(); 
     
-	CleanupStack::Pop(iServiceConnection);
+	//CleanupStack::Pop(iServiceConnection);
     __ASSERT_ALWAYS_NO_LEAVE(delete iServiceConnection);
     iServiceConnection = NULL;
 		
@@ -1882,7 +1882,7 @@
 	TInt err(KErrNone);
 
 	//iServiceConnection = CSenServiceConnection::NewL(*this, KAddressBookServiceId());
-	iServiceConnection = CSenServiceConnection::NewLC(*this, *iSenXmlServiceDescription);
+	iServiceConnection = CSenServiceConnection::NewL(*this, *iSenXmlServiceDescription);
 
 	StartActiveScheduler(1);
 	/*
@@ -1909,12 +1909,12 @@
 	if (transactionIdOrError == KErrNone)
 	    StartActiveScheduler(1);
 //	LOCAL_ASSERT(transactionIdOrError > KErrNone);
-	
+	//CleanupStack::Pop(&iRFileHandle);
 	CleanupStack::PopAndDestroy(&iRFileHandle);
 	if(iFsSessionHandle.Handle())
     	iFsSessionHandle.Close(); 
 
-	CleanupStack::Pop(iServiceConnection);
+	//CleanupStack::Pop(iServiceConnection);
 		__ASSERT_ALWAYS_NO_LEAVE(delete iServiceConnection);
 	iServiceConnection = NULL;
 	 __ASSERT_ALWAYS_NO_LEAVE(delete iSenXmlServiceDescription);
diff -r c5fabff9b552 -r 1adb97a15c2f websrv_pub/web_service_connection_api/tsrc/bc/connection/src/testconsumer.cpp
--- a/websrv_pub/web_service_connection_api/tsrc/bc/connection/src/testconsumer.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/websrv_pub/web_service_connection_api/tsrc/bc/connection/src/testconsumer.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -52,6 +52,4 @@
 	}
  	void CTestConsumer::SetStatus(const TInt aStatus)
  	{
-	}
-
-
+ 	}
\ No newline at end of file
diff -r c5fabff9b552 -r 1adb97a15c2f websrv_pub/web_service_connection_api/tsrc/bc/connection/src/testfileobserver.cpp
--- a/websrv_pub/web_service_connection_api/tsrc/bc/connection/src/testfileobserver.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/websrv_pub/web_service_connection_api/tsrc/bc/connection/src/testfileobserver.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -46,6 +46,4 @@
  	void CTestFileObserver::TransferProgress(TInt aTxnId , TBool aIncoming , const TDesC8& aMessage,
             const TDesC8& aCid , TInt aProgress )
   	{
-	}
-
-
+  	}
\ No newline at end of file
diff -r c5fabff9b552 -r 1adb97a15c2f websrv_pub/web_service_connection_api/tsrc/bc/connection/src/testprovider.cpp
--- a/websrv_pub/web_service_connection_api/tsrc/bc/connection/src/testprovider.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/websrv_pub/web_service_connection_api/tsrc/bc/connection/src/testprovider.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -61,4 +61,4 @@
 	{
 		 return NULL;
 	}
-
+	
\ No newline at end of file
diff -r c5fabff9b552 -r 1adb97a15c2f websrv_pub/web_service_connection_api/tsrc/bc/senutils/sis/52_websrv_senutils.pkg
--- a/websrv_pub/web_service_connection_api/tsrc/bc/senutils/sis/52_websrv_senutils.pkg	Tue Aug 31 16:18:26 2010 +0300
+++ b/websrv_pub/web_service_connection_api/tsrc/bc/senutils/sis/52_websrv_senutils.pkg	Wed Sep 01 12:28:05 2010 +0100
@@ -11,7 +11,7 @@
 ;
 ; Contributors:
 ;
-; Description:        
+; Description:
 ;
 ; Languages
 ; none -  English only by default
diff -r c5fabff9b552 -r 1adb97a15c2f websrv_pub/web_service_connection_api/tsrc/connection/src/senserviceconnectioncases.cpp
--- a/websrv_pub/web_service_connection_api/tsrc/connection/src/senserviceconnectioncases.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/websrv_pub/web_service_connection_api/tsrc/connection/src/senserviceconnectioncases.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -46,9 +46,9 @@
 
 //#include <SenVtcpTransportProperties.h>
 #include "testproperty.h"
-#include <xml/dom/xmlengchunkcontainer.h>
-#include <xml/dom/xmlengfilecontainer.h>
-//#include <xml/dom/XmlEngSerializer.h>
+#include <xmlengchunkcontainer.h>
+#include <xmlengfilecontainer.h>
+//#include <XmlEngSerializer.h>
 
 #include <e32base.h> // for CActive
 #include <aknnotewrappers.h> 
diff -r c5fabff9b552 -r 1adb97a15c2f websrv_pub/web_service_connection_api/tsrc/senConnectionTester/src/senConnectionTesterBlocks.cpp
--- a/websrv_pub/web_service_connection_api/tsrc/senConnectionTester/src/senConnectionTesterBlocks.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/websrv_pub/web_service_connection_api/tsrc/senConnectionTester/src/senConnectionTesterBlocks.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -47,9 +47,9 @@
 
 #include <senvtcptransportproperties.h>
 
-#include <xml/dom/xmlengchunkcontainer.h>
-#include <xml/dom/xmlengfilecontainer.h>
-#include <xml/dom/xmlengserializer.h>
+#include <xmlengchunkcontainer.h>
+#include <xmlengfilecontainer.h>
+#include <xmlengserializer.h>
 
 #include <e32base.h> // for CActive
 #include <aknnotewrappers.h> 
diff -r c5fabff9b552 -r 1adb97a15c2f websrv_pub/web_service_connection_api/tsrc/senutilsTestCases/group/senutilsTestCases.mmp
--- a/websrv_pub/web_service_connection_api/tsrc/senutilsTestCases/group/senutilsTestCases.mmp	Tue Aug 31 16:18:26 2010 +0300
+++ b/websrv_pub/web_service_connection_api/tsrc/senutilsTestCases/group/senutilsTestCases.mmp	Wed Sep 01 12:28:05 2010 +0100
@@ -55,6 +55,7 @@
 //RESOURCE        resource_file2
 
 MW_LAYER_SYSTEMINCLUDE //SYSTEMINCLUDE
+SYSTEMINCLUDE   /epoc32/include 
 SYSTEMINCLUDE   /epoc32/include/xml
 SYSTEMINCLUDE   /epoc32/include/libc
 
diff -r c5fabff9b552 -r 1adb97a15c2f websrv_pub/web_service_description_api/tsrc/bc/senservdesc/sis/TestSD_z.bat
--- a/websrv_pub/web_service_description_api/tsrc/bc/senservdesc/sis/TestSD_z.bat	Tue Aug 31 16:18:26 2010 +0300
+++ b/websrv_pub/web_service_description_api/tsrc/bc/senservdesc/sis/TestSD_z.bat	Wed Sep 01 12:28:05 2010 +0100
@@ -19,5 +19,5 @@
 md e:\BCTest\Results
 
 ATSINTERFACE.EXE -testmodule SenServDescBCTest
-copy c:\Logs\TestFramework\TestReport.txt e:\BCTest\results\WebSrv_WSDescription.txt
+copy c:\Logs\TestFramework\TestReport.txt e:\BCTest\results\ASP_WSDescription.txt
 
diff -r c5fabff9b552 -r 1adb97a15c2f websrv_pub/web_service_description_api/tsrc/senservdescTester/group/senservdescTester.mmp
--- a/websrv_pub/web_service_description_api/tsrc/senservdescTester/group/senservdescTester.mmp	Tue Aug 31 16:18:26 2010 +0300
+++ b/websrv_pub/web_service_description_api/tsrc/senservdescTester/group/senservdescTester.mmp	Wed Sep 01 12:28:05 2010 +0100
@@ -37,6 +37,7 @@
 //TARGETPATH      ?target_path
 DEFFILE         senservdescTester.def
 
+SYSTEMINCLUDE   /epoc32/include 
 MW_LAYER_SYSTEMINCLUDE //SYSTEMINCLUDE
 #ifdef SBSV2
 	USERINCLUDE     ../inc 
diff -r c5fabff9b552 -r 1adb97a15c2f websrv_pub/web_service_manager_api/tsrc/bc/senservicemanager/sis/50_ASP_WSManager.SIS
Binary file websrv_pub/web_service_manager_api/tsrc/bc/senservicemanager/sis/50_ASP_WSManager.SIS has changed
diff -r c5fabff9b552 -r 1adb97a15c2f websrv_pub/web_service_manager_api/tsrc/bc/senservicemanager/sis/50_ASP_WSManager.pkg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/websrv_pub/web_service_manager_api/tsrc/bc/senservicemanager/sis/50_ASP_WSManager.pkg	Wed Sep 01 12:28:05 2010 +0100
@@ -0,0 +1,34 @@
+;
+; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:        
+;
+&EN
+
+; Installation header
+; Only one component name as we only support English
+; UID is the main app's UID
+
+#{"WebServices Manager"},(0x10282CAC),3,0,0,TYPE=SA
+[0x101F7961],0,0,0,{"Series60ProductID"}
+
+; Non-localised vendor name
+:"Nokia Corporation"
+
+; Localised vendor names
+%{"Nokia Corporation"}
+
+; Files to install and to where
+"\Epoc32\Release\armv5\urel\SenServiceManagerBCTest.dll"-"!:\sys\bin\SenServiceManagerBCTest.dll"
+"\Epoc32\winscw\c\testSM_c.bat"-"!:\testSM.bat"
+"\Epoc32\winscw\c\testframework\testframework_senservicemanager.ini"-"!:\testframework\testframework_senservicemanager.ini"
diff -r c5fabff9b552 -r 1adb97a15c2f websrv_pub/web_service_manager_api/tsrc/bc/senservicemanager/sis/52_websrv_wsmanager.pkg
--- a/websrv_pub/web_service_manager_api/tsrc/bc/senservicemanager/sis/52_websrv_wsmanager.pkg	Tue Aug 31 16:18:26 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-;
-; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:        
-;
-; Languages
-; none -  English only by default
-&EN
-
-; Installation header
-; Only one component name as we only support English
-; UID is the main app's UID
-
-#{"WebServices Manager"},(0x10282CAC),3,0,0,TYPE=SA
-[0x101F7961],0,0,0,{"Series60ProductID"}
-
-; Non-localised vendor name
-:"Nokia Corporation"
-
-; Localised vendor names
-%{"Nokia Corporation"}
-
-; Files to install and to where
-"\Epoc32\Release\armv5\urel\SenServiceManagerBCTest.dll"-"!:\sys\bin\SenServiceManagerBCTest.dll"
-"\Epoc32\winscw\c\testSM_c.bat"-"!:\testSM.bat"
-"\Epoc32\winscw\c\testframework\testframework_senservicemanager.ini"-"!:\testframework\testframework_senservicemanager.ini"
diff -r c5fabff9b552 -r 1adb97a15c2f websrv_pub/web_service_manager_api/tsrc/bc/senservicemanager/sis/52_websrv_wsmanager.sis
Binary file websrv_pub/web_service_manager_api/tsrc/bc/senservicemanager/sis/52_websrv_wsmanager.sis has changed
diff -r c5fabff9b552 -r 1adb97a15c2f websrv_pub/web_service_manager_api/tsrc/senservicemanagerTester/group/senservicemanagerTester.mmp
--- a/websrv_pub/web_service_manager_api/tsrc/senservicemanagerTester/group/senservicemanagerTester.mmp	Tue Aug 31 16:18:26 2010 +0300
+++ b/websrv_pub/web_service_manager_api/tsrc/senservicemanagerTester/group/senservicemanagerTester.mmp	Wed Sep 01 12:28:05 2010 +0100
@@ -56,6 +56,7 @@
 
 	SOURCEPATH      ../src
 #endif // SBSV2
+SYSTEMINCLUDE   /epoc32/include 
 MW_LAYER_SYSTEMINCLUDE //SYSTEMINCLUDE
 SYSTEMINCLUDE   /epoc32/include/libc
 
diff -r c5fabff9b552 -r 1adb97a15c2f websrv_pub/web_service_messaging_api/tsrc/bc/newsoapclasses/sis/52_websrv_newsoapclasses.sis
Binary file websrv_pub/web_service_messaging_api/tsrc/bc/newsoapclasses/sis/52_websrv_newsoapclasses.sis has changed
diff -r c5fabff9b552 -r 1adb97a15c2f websrv_pub/web_service_messaging_api/tsrc/bc/newsoapclasses/src/newsoapclassescases.cpp
--- a/websrv_pub/web_service_messaging_api/tsrc/bc/newsoapclasses/src/newsoapclassescases.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/websrv_pub/web_service_messaging_api/tsrc/bc/newsoapclasses/src/newsoapclassescases.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -384,7 +384,7 @@
     CleanupStack::PopAndDestroy(pAsXml);    	
     TInt var = pEnvelope->TxnId();
     if(var >= 0)
-     return KErrArgument;
+   return KErrArgument;
     
     __ASSERT_ALWAYS_NO_LEAVE(delete pEnvelope);
     pEnvelope = NULL;
diff -r c5fabff9b552 -r 1adb97a15c2f websrv_pub/web_service_messaging_api/tsrc/newsoapclassesTester/group/newsoapclassesTester.mmp
--- a/websrv_pub/web_service_messaging_api/tsrc/newsoapclassesTester/group/newsoapclassesTester.mmp	Tue Aug 31 16:18:26 2010 +0300
+++ b/websrv_pub/web_service_messaging_api/tsrc/newsoapclassesTester/group/newsoapclassesTester.mmp	Wed Sep 01 12:28:05 2010 +0100
@@ -35,6 +35,7 @@
 //TARGETPATH      ?target_path
 DEFFILE         newsoapclassesTester.def
 
+SYSTEMINCLUDE           /epoc32/include
 SYSTEMINCLUDE           /epoc32/include/xml
 SYSTEMINCLUDE           /epoc32/include/libc
 APP_LAYER_SYSTEMINCLUDE  //SYSTEMINCLUDE
diff -r c5fabff9b552 -r 1adb97a15c2f websrv_pub/xml_extensions_api/tsrc/senxmlTester/group/senxmlTester.mmp
--- a/websrv_pub/xml_extensions_api/tsrc/senxmlTester/group/senxmlTester.mmp	Tue Aug 31 16:18:26 2010 +0300
+++ b/websrv_pub/xml_extensions_api/tsrc/senxmlTester/group/senxmlTester.mmp	Wed Sep 01 12:28:05 2010 +0100
@@ -61,6 +61,7 @@
 //RESOURCE        resource_file
 //RESOURCE        resource_file2
 
+SYSTEMINCLUDE   /epoc32/include 
 SYSTEMINCLUDE   /epoc32/include/libc
 MW_LAYER_SYSTEMINCLUDE //SYSTEMINCLUDE
 LIBRARY         bafl.lib
diff -r c5fabff9b552 -r 1adb97a15c2f websrv_pub/xml_fragment_api/inc/RSenDocument.h
--- a/websrv_pub/xml_fragment_api/inc/RSenDocument.h	Tue Aug 31 16:18:26 2010 +0300
+++ b/websrv_pub/xml_fragment_api/inc/RSenDocument.h	Wed Sep 01 12:28:05 2010 +0100
@@ -26,8 +26,8 @@
 #ifndef R_SEN_DOCUMENT
 #define R_SEN_DOCUMENT
 
-#include <xml/dom/xmlengdocument.h>
-#include <xml/dom/xmlengdomimplementation.h>
+#include <xmlengdocument.h>
+#include <xmlengdomimplementation.h>
 
 typedef struct
     {
diff -r c5fabff9b552 -r 1adb97a15c2f websrv_pub/xml_fragment_api/inc/SenFragmentBase.h
--- a/websrv_pub/xml_fragment_api/inc/SenFragmentBase.h	Tue Aug 31 16:18:26 2010 +0300
+++ b/websrv_pub/xml_fragment_api/inc/SenFragmentBase.h	Wed Sep 01 12:28:05 2010 +0100
@@ -32,7 +32,7 @@
 #include <xml/contenthandler.h>
 #include <RSenDocument.h>
 #include <SenParser.h>
-#include <xml/dom/xmlengelement.h>
+#include <xmlengelement.h>
 
 using namespace Xml;
 
diff -r c5fabff9b552 -r 1adb97a15c2f websrv_pub/xml_fragment_api/tsrc/senfragmentTester/src/SenFragmentTesterBlocks.cpp
--- a/websrv_pub/xml_fragment_api/tsrc/senfragmentTester/src/SenFragmentTesterBlocks.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/websrv_pub/xml_fragment_api/tsrc/senfragmentTester/src/SenFragmentTesterBlocks.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -26,17 +26,17 @@
 #include <SenFragmentBase.h>
 #include <SenParser.h>
 #include <RSenDocument.h>
-#include <xml/dom/xmlengdomutils.h>
+#include <xmlengdomutils.h>
 
 #if defined( __SERIES60_31__ ) || (!defined( __SERIES60_30__ ) && defined( SYMBIAN_SWI_POST_INSTALL_REVOCATION) )
     #include <xml/matchdata.h>
 #endif    
 
 #include <xml/parserfeature.h>           // for TParserFeature enumeration
-#include <xml/dom/xmlengserializationoptions.h> // needed for TSerializationOptions
-#include <xml/dom/xmlengbinarycontainer.h>
+#include <xmlengserializationoptions.h> // needed for TSerializationOptions
+#include <xmlengbinarycontainer.h>
 #include <s32mem.h>
-#include <xml/dom/xmlengdom.h>
+#include <xmlengdom.h>
 
 //  INTERNAL INCLUDES
 #include "maindomfragment.h"