--- a/backupandrestore/backupengine/src/absession.cpp	Thu Aug 19 10:44:03 2010 +0300
+++ b/backupandrestore/backupengine/src/absession.cpp	Tue Aug 31 16:03:15 2010 +0300
@@ -148,7 +148,12 @@
 		iCallbackWatchdog = NULL;
 		
 		// Remove this session from the server's session map
-		Server().RemoveElement(iClientSID);
+		// Use dynamic_cast in case that ABServer is deconstructing 
+		CABServer *pServer = dynamic_cast<CABServer*>(const_cast<CServer2*>(CSession2::Server()));
+		if(pServer)
+			{
+			pServer->RemoveElement(iClientSID);
+			}		
 		
 		// Clear up any outstanding message
 		HandleIPCClosingDownCallback();
@@ -159,7 +164,10 @@
 		// If the client has detached properly, they should
 		// have done this - but just in case.
 		//DoCancelWaitForCallback();
-		Server().DropSession();
+		if(pServer)
+			{
+			pServer->DropSession();
+			}
 		}
 		
 	void CABSession::CreateL()

--- a/backupandrestore/backuptest/ABTester/data/backup_public_files_registration.xml	Thu Aug 19 10:44:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-
-
-<backup_registration>
-    <passive_backup>
-        <include_directory name = "\"/>
-    </passive_backup>
-    
-    <public_backup>
-      <include_directory name = "c:\public\0FA00001\"/>
-    </public_backup>
-    
-    <restore requires_reboot = "no"/>
-</backup_registration>
\ No newline at end of file

Binary file backupandrestore/backuptest/ABTester/data/base_active_backup_registration.xml has changed

Binary file backupandrestore/backuptest/ABTester/data/base_active_backup_registration2.xml has changed

Binary file backupandrestore/backuptest/ABTester/data/base_active_backup_registration3.xml has changed

Binary file backupandrestore/backuptest/ABTester/data/incremental_active_backup_registration.xml has changed

--- a/backupandrestore/backuptest/ABTester/data/passive_backup_registration.xml	Thu Aug 19 10:44:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-
-
-<backup_registration>
-   <passive_backup supports_selective="no" delete_before_restore="no" base_backup_only="yes">
-      <include_file name = "privatedata.txt"/>
-      
-      <include_file name = "sbetest1.txt"/>
-      <include_file name = "sbetest2.txt"/>
-      <include_file name = "\sbetest3.txt"/>
-      <include_file name = "sys\install\log.txt"/>
-      <include_file name = "b:\system\System.ini"/>
-      <include_file name = "z:\resource\locales.txt"/>
-      <include_file name = "\resource2\locales.txt"/>
-      <include_file name = "!:\resource2\locales.txt"/>
-      <include_file name = "?:\resource2\locales.txt"/>
-      <include_file name = "*:\resource2\locales.txt"/>
-      <include_directory name="\" />
-      <include_directory name="c:\private\0AB7E58C" />
-      <include_directory name="c:\private\0AB7E58C\" />
-      <include_directory name="z:\private\0AB7E58C" />
-      <include_directory name="z:\private\0AB7E58C\" />
-      <include_directory name2="\" />
-      <include_directory name="" />
-      <include_directory name2="" />
-      
-      <include_directory name="c:\" />
-      <include_directory name="!:\mydatabases\"/>
-      <exclude name = "sbetest1.txt"/>
-      <exclude name = "sbetest2.txt"/>
-      <exclude name = "\sbetest3.txt"/>
-      <exclude name = "sys\install\log.txt"/>
-      <exclude name = "a:\sbetest3_ex.txt"/>
-      <exclude name = "\:\sbetest1_ex.txt"/>
-      <exclude name = "sbetest2_ex.txt"/>
-      <exclude name = "\sys\install\log_ex.txt"/>
-      <exclude name = "\system\System_ex.ini"/>
-      <exclude name = "\resource\locales_ex.txt"/>
-      <exclude name = "\resource2\locales_ex.txt"/>
-      <exclude name = "!:\resource2\locales_ex.txt"/>
-      <exclude name = "?:\resource2\locales_ex.txt"/>
-      <exclude name = "*:\resource2\locales_ex.txt"/>
-      <exclude name="\a_ex" />
-      <exclude name="?:\b_ex" />
-      <exclude name="!:\mydatabases_ex\"/>
-    </passive_backup>
-    <public_backup delete_before_restore="yes">
-      <include_file name = "c:\sbetest1.txt"/>
-      <include_file name = "c:\sbetest2.txt"/>
-      <include_file name = "\sbetest3.txt"/>
-      <include_file name = "c:\sys\install\log.txt"/>
-      <include_file name = "c:\system\System.ini"/>
-      <include_file name = "c:\resource\locales.txt"/>
-      <include_file name = "\resource2\locales.txt"/>
-      <include_file name = "!:\resource2\locales.txt"/>
-      <include_file name = "?:\resource2\locales.txt"/>
-      <include_file name = "*:\resource2\locales.txt"/>
-      <include_directory name="\" />
-      <include_directory name="c:\private\0AB7E58C" />
-      <include_directory name="c:\private\0AB7E58C\" />
-      <include_directory name="z:\private\0AB7E58C" />
-      <include_directory name="z:\private\0AB7E58C\" />
-      <include_directory name2="\" />
-      <include_directory name="" />
-      <include_directory name2="" />
-      
-      <include_directory name="c:\" />
-      <include_directory name="!:\mydatabases\"/>
-      <exclude name = "c:\sbetest3_ex.txt"/>
-      <exclude name = "c:\sbetest1_ex.txt"/>
-      <exclude name = "c:\sbetest2_ex.txt"/>
-      <exclude name = "\sbetest3.txt"/>
-      <exclude name = "c:\sys\install\log_ex.txt"/>
-      <exclude name = "c:\system\System_ex.ini"/>
-      <exclude name = "c:\resource\locales_ex.txt"/>
-      <exclude name = "\resource2\locales_ex.txt"/>
-      <exclude name = "!:\resource2\locales_ex.txt"/>
-      <exclude name = "?:\resource2\locales_ex.txt"/>
-      <exclude name = "*:\resource2\locales_ex.txt"/>
-      <exclude name="\a_ex" />
-      <exclude name="c:\b_ex" />
-      <exclude name="!:\mydatabases_ex\"/>
-      
-   </public_backup>
-   <dbms_backup policy="AABBCCDDsdfsdafsdfsdafqw2332"/>
-   <dbms_backup policy=""/>
-   <dbms_backup/>
-   <dbms_backup policy="0x0AB7E58C"/>
-   <dbms_backup database="0x0AB7E58C"/>
-   <dbms_backup test1="0x0AB7E58C"/>
-   <system_backup />
-   <proxy_data_manager test2="0x10202BE9" />
-   <restore requires_reboot = "no"/>
-</backup_registration>

Binary file backupandrestore/backuptest/ABTester/data/proxy_active_backup_registration.xml has changed

--- a/backupandrestore/backuptest/ABTester/group/abtester.iby	Thu Aug 19 10:44:03 2010 +0300
+++ b/backupandrestore/backuptest/ABTester/group/abtester.iby	Tue Aug 31 16:03:15 2010 +0300
@@ -21,13 +21,13 @@
 file=ABI_DIR\BUILD_DIR\abtestclient3.EXE	    	System\programs\abtestclient3.EXE
 file=ABI_DIR\BUILD_DIR\abtestclient4.EXE	    	System\programs\abtestclient4.EXE
 
-data=DATAZ_\private\0AB7E57C\backup_registration.xml  private\0AB7E57C\backup_registration.xml
-data=DATAZ_\private\0AB7E57D\backup_registration.xml  private\0AB7E57D\backup_registration.xml
-data=DATAZ_\private\0AB7E57E\backup_registration.xml  private\0AB7E57E\backup_registration.xml
-data=DATAZ_\private\0AB7E58A\backup_registration.xml  private\0AB7E58A\backup_registration.xml
-data=DATAZ_\private\0AB7E58B\backup_registration.xml  private\0AB7E58B\backup_registration.xml
-data=DATAZ_\private\0AB7E58C\backup_registration.xml  private\0AB7E58C\backup_registration.xml
+data=DATAZ_\private\0ab7e57c\backup_registration.xml  private\0ab7e57c\backup_registration.xml
+data=DATAZ_\private\0ab7e57d\backup_registration.xml  private\0ab7e57d\backup_registration.xml
+data=DATAZ_\private\0ab7e57e\backup_registration.xml  private\0ab7e57e\backup_registration.xml
+data=DATAZ_\private\0ab7e58a\backup_registration.xml  private\0ab7e58a\backup_registration.xml
+data=DATAZ_\private\0ab7e58b\backup_registration.xml  private\0ab7e58b\backup_registration.xml
+data=DATAZ_\private\0ab7e58c\backup_registration.xml  private\0ab7e58c\backup_registration.xml
 
-data=DATAZ_\private\0FA00001\backup_registration.xml  private\0FA00001\backup_registration.xml
+data=DATAZ_\private\0fa00001\backup_registration.xml  private\0fa00001\backup_registration.xml
 
 #endif

--- a/backupandrestore/backuptest/burtestserver/Group/bld.inf	Thu Aug 19 10:44:03 2010 +0300
+++ b/backupandrestore/backuptest/burtestserver/Group/bld.inf	Tue Aug 31 16:03:15 2010 +0300
@@ -40,9 +40,8 @@
 ../testscripts/test_restorepackage.script       z:/testdata/scripts/sbetestdata/test_restorepackage.script
 ../testscripts/test_increament.script           z:/testdata/scripts/sbetestdata/test_increament.script
 
-../testscripts/sbeconfig.xml                /epoc32/release/winscw/udeb/z/private/10202d56/sbeconfig.xml
-../testscripts/sbeconfig.xml                /epoc32/release/winscw/urel/z/private/10202d56/sbeconfig.xml
-
+../../testdata/armv5/bigexeforbackup.sis     /epoc32/data/z/testdata/scripts/sbetestdata/bigexeforbackup.sis
+../../testdata/armv5/test_dll_nopublic.sis   /epoc32/data/z/testdata/scripts/sbetestdata/test_dll_nopublic.sis
 PRJ_TESTMMPFILES
     burtestserver.mmp
 

--- a/backupandrestore/backuptest/burtestserver/Group/burtestserver.iby	Thu Aug 19 10:44:03 2010 +0300
+++ b/backupandrestore/backuptest/burtestserver/Group/burtestserver.iby	Tue Aug 31 16:03:15 2010 +0300
@@ -35,6 +35,10 @@
 data=EPOCROOT##Epoc32\data\z\testdata\scripts\sbetestdata\test_activebackuprestore.script  testdata\scripts\sbetestdata\test_activebackuprestore.script
 data=EPOCROOT##Epoc32\data\z\testdata\scripts\sbetestdata\test_increament.script           testdata\scripts\sbetestdata\test_increament.script
 
+data=EPOCROOT##Epoc32\data\z\testdata\scripts\sbetestdata\bigexeforbackup.sis              testdata\scripts\sbetestdata\bigexeforbackup.sis
+data=EPOCROOT##Epoc32\data\z\testdata\scripts\sbetestdata\test_dll_nopublic.sis            testdata\scripts\sbetestdata\test_dll_nopublic.sis
+
+
 #ifndef __SERIES60_ 
 data=EPOCROOT##Epoc32\data\z\testdata\scripts\sbetestdata\sbeconfig.xml                    private\10202d56\sbeconfig.xml
 #endif

--- a/backupandrestore/backuptest/burtestserver/TestSteps/inc/t_burteststepbase.h	Thu Aug 19 10:44:03 2010 +0300
+++ b/backupandrestore/backuptest/burtestserver/TestSteps/inc/t_burteststepbase.h	Tue Aug 31 16:03:15 2010 +0300
@@ -90,6 +90,9 @@
 		
 	public:
 		RSIDArray iSidArray;
+		// add support for exclude sid list
+		RSIDArray iExcludeSidArray;
+		
 		
 	private:
 		HBufC* GetIndentation(TInt aLevel);

--- a/backupandrestore/backuptest/burtestserver/TestSteps/src/t_burteststepbase.cpp	Thu Aug 19 10:44:03 2010 +0300
+++ b/backupandrestore/backuptest/burtestserver/TestSteps/src/t_burteststepbase.cpp	Tue Aug 31 16:03:15 2010 +0300
@@ -63,6 +63,9 @@
 		iDataOwners.Close();
 			
 		iSidArray.Close();
+		
+		iExcludeSidArray.Close();
+		
 		iJidArray.Close();
 		iPublicFileNames.Close();
 		iPrivateFileNames.Close();
@@ -387,6 +390,48 @@
 		/** Read private file sizes into array */
 		_LIT(KExpectPrivateFileSizes, "ExpectPrivateFileSizes");
 		ReadListIntoIntArray(KExpectPrivateFileSizes, delimiter, iPrivateFileSizes);
+	
+		// Read Exclude IDs LIST //
+		TSecureId sid;           
+	    TChar ch;
+	    TPtrC list;
+	
+	    // clear the array
+	    iExcludeSidArray.Reset();
+	    // read the string
+        _LIT(KExcludeSIDList, "ExcludeIDs");
+        GetStringFromConfig(ConfigSection(), KExcludeSIDList, list);
+        TLex sidLex(list);
+        // parse the string
+        while (!sidLex.Eos())
+            {
+            sidLex.Mark();
+            ch=sidLex.Peek();
+
+            while(!sidLex.Eos() && ( ch=sidLex.Peek() ) != TChar(','))
+                sidLex.Inc();
+
+            if(!sidLex.TokenLength())
+                continue;
+            
+            TPtrC pToken = sidLex.MarkedToken();
+            TLex token(pToken);
+            
+            if (pToken.Length() <= KMaxHexLength && token.Val(sid.iId, EHex) == KErrNone)
+                {
+                iExcludeSidArray.Append(sid);
+                _LIT(KFound, "Exclude ID Found in ini file: ");
+                LogWithSID(LOG_LEVEL4, KFound, sid);        
+                } //if
+                    
+            if(ch==TChar(','))
+                sidLex.Inc();
+            
+            sidLex.SkipSpace();
+    
+            } //while
+                    
+		
 		}
 		
 	void CBURTestStepBase::ReadListIntoStringArray(const TDesC& aSectionName, const TChar& aDelimiter, RArray<TPtrC>& aResultList)
@@ -458,7 +503,6 @@
 			LogWithNum(LOG_LEVEL2,KTempText1, err);
 			iFailures++;
 			}
-
 		// Log
 		if (iDataOwners.Count() == 0)
 			{
@@ -470,6 +514,30 @@
 			_LIT(KTempText4, "Number of data owners found on device: ");
 			LogWithNum(LOG_LEVEL3, KTempText4, iDataOwners.Count());
 			}
+			
+		//filter the dataowners per the exclude SID list
+		for (TInt index = 0; index < iDataOwners.Count(); index++)
+            {
+            TSecureId sid = NULL;
+            sid = ExtractIDL(*iDataOwners[index]);
+            
+            if (sid != NULL)
+                {
+                TInt position = iExcludeSidArray.Find(sid);
+                if (position != KErrNotFound)
+                    {
+                    _LIT(KTempText2, "ExcludeID found in list of data owners: ");
+                    LogWithSID(LOG_LEVEL3, KTempText2, sid);
+                    
+                    delete iDataOwners[index];
+                    iDataOwners[index] = NULL;
+                    iDataOwners.Remove(index);
+                    index--;
+                    }            
+                }
+            }
+		       
+		
 		}
 		
 	void CBURTestStepBase::PopulateListOfDataOwnersAsyncL()
@@ -510,6 +578,28 @@
 			_LIT(KTempText4, "Number of data owners found on device: ");
 			LogWithNum(LOG_LEVEL3, KTempText4, iDataOwners.Count());
 			}
+		
+        //filter the dataowners per the exclude SID list
+        for (TInt index = 0; index < iDataOwners.Count(); index++)
+            {
+            TSecureId sid = NULL;
+            sid = ExtractIDL(*iDataOwners[index]);
+            
+            if (sid != NULL)
+                {
+                TInt position = iExcludeSidArray.Find(sid);
+                if (position != KErrNotFound)
+                    {
+                    _LIT(KTempText2, "ExcludeID found in list of data owners: ");
+                    LogWithSID(LOG_LEVEL3, KTempText2, sid);
+                    
+                    delete iDataOwners[index];
+                    iDataOwners[index] = NULL;
+                    iDataOwners.Remove(index);
+                    index--;
+                    }            
+                }
+            }
 		}
 	
 	void CBURTestStepBase::SetBURModeL(TBURPartType aBURPartType, TBackupIncType aBackupIncType)
@@ -557,8 +647,8 @@
 		for (TInt index = 0; index < iDataOwners.Count(); index++)
 			{
 			TBool notFound = ETrue;
-			sid = ExtractIDL(*iDataOwners[index]);
-			
+			sid = ExtractIDL(*iDataOwners[index]);	
+			                    
 			if (sid != NULL)
 				{
 				TInt position = iSidArray.Find(sid);
@@ -576,19 +666,22 @@
 			else // possibly jid
 				{
 				HBufC* pSuiteHash = ExtractJavaIDL(*iDataOwners[index]);
-				TPtrC suiteHash = pSuiteHash->Des();
-				if (iJidArray.Find(suiteHash) != KErrNotFound)
-					{
-					_LIT(KTempText3, "Java ID found in list of data owners: ");
-					LogWithText(LOG_LEVEL3, KTempText3, suiteHash);
-					notFound = EFalse;
-					}
-				else // not found 
-					{
-					notFound = ETrue;
-					}
-				delete pSuiteHash;
-				pSuiteHash = NULL;
+				if (pSuiteHash != NULL)
+				    {
+                    TPtrC suiteHash = pSuiteHash->Des();
+                    if (iJidArray.Find(suiteHash) != KErrNotFound)
+                        {
+                        _LIT(KTempText3, "Java ID found in list of data owners: ");
+                        LogWithText(LOG_LEVEL3, KTempText3, suiteHash);
+                        notFound = EFalse;
+                        }
+                    else // not found 
+                        {
+                        notFound = ETrue;
+                        }
+                    delete pSuiteHash;
+                    pSuiteHash = NULL;
+				    }
 				}
 			if (notFound)
 				{
@@ -1223,6 +1316,12 @@
 					j--;
 					total--;
 					}
+				else
+				    {
+                    // print the status
+                    LogWithSID(LOG_LEVEL3, _L("---The unexpected dataowner status-SID: "),statusArray[j].iSID.iId);
+                    LogWithNum(LOG_LEVEL3,_L("---The unexpected dataowner status-status: "),statusArray[j].iStatus) ;
+				    }
 				} //for	
 			statusArray.Reset();
 			CleanupStack::PopAndDestroy(&statusArray);
@@ -1367,8 +1466,25 @@
 					
 				for (TInt i=0; i < KRetries;)
 					{
+				
+                  
+                    LogWithNum(LOG_LEVEL3,_L("retryies :"), i);
+				
 					CheckSIDStatusL(iTransferTypes, readyArray);
-											
+								
+					
+					LogWithNum(LOG_LEVEL3,_L("readyArray count :"), readyArray.Count());
+					
+					// print all the ready array
+					for(TInt jj = 0 ; jj < readyArray.Count(); jj++)
+					    {
+                         CSBSIDTransferType* type = CSBSIDTransferType::NewL(readyArray[jj]);
+					     CleanupStack::PushL(type);
+					     
+					     LogWithSID(LOG_LEVEL3, _L("readyArray SIDs : ") , type->SecureIdL());
+					     CleanupStack::PopAndDestroy(type);
+					    }
+					
 					if (readyArray.Count()) // dataowners ready
 						{
 						// ========= Supply Data ================
@@ -1389,6 +1505,19 @@
 					iFailures++;
 					_LIT(KLogNoTrans, "***Error: Some Data Owners were Not Ready or Failed to Connect");
 					Log(LOG_LEVEL3, KLogNoTrans);
+					
+					// print the remenan sids
+					for( TInt kk = 0 ; kk <iTransferTypes.Count() ; kk++)
+					    {
+                        
+                        CSBSIDTransferType* sidType = CSBSIDTransferType::NewL(iTransferTypes[kk]);
+					    CleanupStack::PushL(sidType);
+					    TSecureId id = NULL;
+					    id = sidType->SecureIdL();
+					    CleanupStack::PopAndDestroy(sidType);
+                        LogWithSID(LOG_LEVEL3, _L("--iTransferTypes, remanent SIDs : "),id.iId);
+					    }
+					//
 					}
 				readyArray.ResetAndDestroy();
 				CleanupStack::PopAndDestroy(&readyArray);
@@ -1482,7 +1611,6 @@
 			{
 			User::Leave(KErrInUse);
 			}
-		iStatus = KRequestPending;
 		SetActive();
 		iActiveScheduler->Start();
 		}