# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1271419686 -10800
# Node ID c4cbaa4fb734113946429b806cb4268777490ea7
# Parent  2e3d3ce01487a77fe53efe6610b14bb2ed37d739
Revision: 201011
Kit: 201015

diff -r 2e3d3ce01487 -r c4cbaa4fb734 Distribution.Policy.S60
--- a/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/ServiceRegistry/distribution.policy.s60
--- a/appfw/apparchitecture/ServiceRegistry/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/apfile/distribution.policy.s60
--- a/appfw/apparchitecture/apfile/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/apgrfx/distribution.policy.s60
--- a/appfw/apparchitecture/apgrfx/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/aplist/distribution.policy.s60
--- a/appfw/apparchitecture/aplist/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/apparc/distribution.policy.s60
--- a/appfw/apparchitecture/apparc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/apserv/distribution.policy.s60
--- a/appfw/apparchitecture/apserv/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/apsexe/distribution.policy.s60
--- a/appfw/apparchitecture/apsexe/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/apstart/distribution.policy.s60
--- a/appfw/apparchitecture/apstart/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/bwins/distribution.policy.s60
--- a/appfw/apparchitecture/bwins/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/conf/distribution.policy.s60
--- a/appfw/apparchitecture/conf/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/eabi/distribution.policy.s60
--- a/appfw/apparchitecture/eabi/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/group/app-framework_apparc.mrp
--- a/appfw/apparchitecture/group/app-framework_apparc.mrp	Tue Feb 02 10:12:00 2010 +0200
+++ b/appfw/apparchitecture/group/app-framework_apparc.mrp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,3 +1,19 @@
+#
+# 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: 
+#
+
 component	app-framework_apparc
 source	\sf\mw\appsupport\appfw\apparchitecture
 binary	\sf\mw\appsupport\appfw\apparchitecture\group	all
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/group/backup_registration.xml
--- a/appfw/apparchitecture/group/backup_registration.xml	Tue Feb 02 10:12:00 2010 +0200
+++ b/appfw/apparchitecture/group/backup_registration.xml	Fri Apr 16 15:08:06 2010 +0300
@@ -1,10 +1,10 @@
 <?xml version="1.0" standalone="yes"?>
 
 <!--
- Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+ Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
  All rights reserved.
  This component and the accompanying materials are made available
- under the terms of the License "Eclipse Public License v1.0"
+ 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".
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/group/distribution.policy.s60
--- a/appfw/apparchitecture/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/inc/distribution.policy.s60
--- a/appfw/apparchitecture/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/tdata/Corrupted_reg.RSC
--- a/appfw/apparchitecture/tdata/Corrupted_reg.RSC	Tue Feb 02 10:12:00 2010 +0200
+++ b/appfw/apparchitecture/tdata/Corrupted_reg.RSC	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,7 @@
 // Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// 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".
 //
@@ -21,4 +21,4 @@
  @internalComponent - Internal Symbian test code 
 */
 
-kJ!€º<©ÁÚ$ Õ 
 	        beytfyugjcert    
\ No newline at end of file
+kJ!€º<©ÁÚ$ Õ 
 	        beytfyugjcert    
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/tdata/TSTAPPU.DOC
Binary file appfw/apparchitecture/tdata/TSTAPPU.DOC has changed
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/tdata/distribution.policy.s60
--- a/appfw/apparchitecture/tdata/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/tdata/mimecontentpolicy/distribution.policy.s60
--- a/appfw/apparchitecture/tdata/mimecontentpolicy/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/tdatasrc/distribution.policy.s60
--- a/appfw/apparchitecture/tdatasrc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/tef/TAppInstall/distribution.policy.s60
--- a/appfw/apparchitecture/tef/TAppInstall/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/tef/TBufferOnlyRec/distribution.policy.s60
--- a/appfw/apparchitecture/tef/TBufferOnlyRec/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/tef/TESTREC/distribution.policy.s60
--- a/appfw/apparchitecture/tef/TESTREC/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/tef/TEndTaskTestApp/distribution.policy.s60
--- a/appfw/apparchitecture/tef/TEndTaskTestApp/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/tef/TMimeRec/distribution.policy.s60
--- a/appfw/apparchitecture/tef/TMimeRec/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/tef/TMimeRec1/distribution.policy.s60
--- a/appfw/apparchitecture/tef/TMimeRec1/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/tef/TNonNative/distribution.policy.s60
--- a/appfw/apparchitecture/tef/TNonNative/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/tef/TRecUpgrade/distribution.policy.s60
--- a/appfw/apparchitecture/tef/TRecUpgrade/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/tef/TRecUpgrade_1/distribution.policy.s60
--- a/appfw/apparchitecture/tef/TRecUpgrade_1/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/tef/TRecUpgrade_2/distribution.policy.s60
--- a/appfw/apparchitecture/tef/TRecUpgrade_2/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/tef/TSidChecker/distribution.policy.s60
--- a/appfw/apparchitecture/tef/TSidChecker/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/tef/T_DataPrioritySystem1/distribution.policy.s60
--- a/appfw/apparchitecture/tef/T_DataPrioritySystem1/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/tef/T_DataPrioritySystem2/distribution.policy.s60
--- a/appfw/apparchitecture/tef/T_DataPrioritySystem2/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/tef/T_EnvSlots/distribution.policy.s60
--- a/appfw/apparchitecture/tef/T_EnvSlots/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/tef/distribution.policy.s60
--- a/appfw/apparchitecture/tef/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/tef/scripts/distribution.policy.s60
--- a/appfw/apparchitecture/tef/scripts/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/tef/scripts/emulator/distribution.policy.s60
--- a/appfw/apparchitecture/tef/scripts/emulator/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/tef/scripts/hardware/distribution.policy.s60
--- a/appfw/apparchitecture/tef/scripts/hardware/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/tef/tRuleBasedApps/distribution.policy.s60
--- a/appfw/apparchitecture/tef/tRuleBasedApps/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/tef/testapp/testforceregistrationapp1/distribution.policy.s60
--- a/appfw/apparchitecture/tef/testapp/testforceregistrationapp1/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/tef/testapp/testupdregappuninstallation/distribution.policy.s60
--- a/appfw/apparchitecture/tef/testapp/testupdregappuninstallation/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/tef/testapp/testupgradeupdregappuninstallation/distribution.policy.s60
--- a/appfw/apparchitecture/tef/testapp/testupgradeupdregappuninstallation/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/tef/tlargestack/distribution.policy.s60
--- a/appfw/apparchitecture/tef/tlargestack/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/tef/tnotifydrivesapp/distribution.policy.s60
--- a/appfw/apparchitecture/tef/tnotifydrivesapp/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/tef/tssaac/distribution.policy.s60
--- a/appfw/apparchitecture/tef/tssaac/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/tef/tssaac/scripts/emulator/distribution.policy.s60
--- a/appfw/apparchitecture/tef/tssaac/scripts/emulator/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/tef/tssaac/scripts/hardware/distribution.policy.s60
--- a/appfw/apparchitecture/tef/tssaac/scripts/hardware/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/apparchitecture/tef/tupgradeiconapp/distribution.policy.s60
--- a/appfw/apparchitecture/tef/tupgradeiconapp/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/uiftestfw/automation/SubsystemList.py
--- a/appfw/uiftestfw/automation/SubsystemList.py	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-# SubsystemList.txt
-# Copyright (c) 1995-2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of the License "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:
-#
-# SubsystemList_95.txt
-# This file lists the subsystem components that are to be built.
-# Each line points to a bld.inf
-
-\app-framework\TestFramework\group
-\app-framework\animation\group
-\app-framework\bmpanim\group
-\app-framework\clock\group
-\app-framework\cone\group
-\app-framework\egul\group
-\app-framework\errorresgt\group
-\app-framework\fepbase\group
-\app-framework\gfxtranseffect\group
-\app-framework\grid\group
-\app-framework\print\group
-\app-framework\uiklafGT\group
-\app-framework\uikon\group
-
-\thindump\group
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/uiftestfw/automation/SubsystemList.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/uiftestfw/automation/SubsystemList.txt	Fri Apr 16 15:08:06 2010 +0300
@@ -0,0 +1,33 @@
+# SubsystemList.txt
+# Copyright (c) 2007-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:
+# SubsystemList_95.txt
+# This file lists the subsystem components that are to be built.
+# Each line points to a bld.inf
+
+\app-framework\TestFramework\group
+\app-framework\animation\group
+\app-framework\bmpanim\group
+\app-framework\clock\group
+\app-framework\cone\group
+\app-framework\egul\group
+\app-framework\errorresgt\group
+\app-framework\fepbase\group
+\app-framework\gfxtranseffect\group
+\app-framework\grid\group
+\app-framework\print\group
+\app-framework\uiklafGT\group
+\app-framework\uikon\group
+
+\thindump\group
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/uiftestfw/automation/distribution.policy.s60
--- a/appfw/uiftestfw/automation/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/uiftestfw/automation/testlists/emulator/distribution.policy.s60
--- a/appfw/uiftestfw/automation/testlists/emulator/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/uiftestfw/automation/testlists/emulator/tests_sw_core.py
--- a/appfw/uiftestfw/automation/testlists/emulator/tests_sw_core.py	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +0,0 @@
-# tests_sw_core.txt
-# Copyright (c) 1995-2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of the License "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:
-#
-# program,log,commdb,script,timeout,release,pre cmd,post cmd
-
-# NOTE: Execution order is essentially alphabetical, except where noted.
-
-# DUMMY TEST 
-# workaround for DEF059510 to prevent first test case randomly failing
-appfwk_test_dummytest, epocwind.out, , , 180
-
-# ANIMATION TESTS
-TESTEXECUTE, C:\logs\testexecute\animationtest_t_basic.htm,     , z:\animationtest\animationtest_t_basic.script,  600
-TESTEXECUTE, C:\logs\testexecute\animationtest_t_custom.htm,    , z:\animationtest\animationtest_t_custom.script, 600
-TESTEXECUTE, C:\logs\testexecute\animationtest_t_frames.htm,    , z:\animationtest\animationtest_t_frames.script, 600
-TESTEXECUTE, C:\logs\testexecute\animationtest_t_mng.htm,       , z:\animationtest\animationtest_t_mng.script,    600
-TESTEXECUTE, C:\logs\testexecute\animationtest_t_oom.htm,       , z:\animationtest\animationtest_t_oom.script,    600
-TESTEXECUTE, C:\logs\testexecute\animationtest_t_synch.htm,     , z:\animationtest\animationtest_t_synch.script,  600
-
-# BMPANIM TESTS
-TESTEXECUTE, C:\logs\testexecute\bmpanimtest_t_autoan.htm,      , z:\bmpanimtest\bmpanimtest_t_autoan.script,     600
-TESTEXECUTE, C:\logs\testexecute\bmpanimtest_t_bmpanim.htm,     , z:\bmpanimtest\bmpanimtest_t_bmpanim.script,    600
-
-# CLOCK TESTS
-TESTEXECUTE, C:\logs\testexecute\clocktest_t_clck0.htm,         , z:\clocktest\clocktest_t_clck0.script,          600
-TESTEXECUTE, C:\logs\testexecute\clocktest_t_clck1.htm,         , z:\clocktest\clocktest_t_clck1.script,          600
-TESTEXECUTE, C:\logs\testexecute\clocktest_t_msgwin0.htm,       , z:\clocktest\clocktest_t_msgwin0.script,        600
-
-# CONE TESTS
-TESTEXECUTE, C:\logs\testexecute\conetest_t_background.htm,     	, z:\conetest\conetest_t_background.script,       600
-TESTEXECUTE, C:\logs\testexecute\conetest_t_coedatastorage.htm, 	, z:\conetest\conetest_t_coedatastorage.script,   600
-TESTEXECUTE, C:\logs\testexecute\conetest_t_cone0.htm,          	, z:\conetest\conetest_t_cone0.script,            600
-TESTEXECUTE, C:\logs\testexecute\conetest_t_cone1.htm,          	, z:\conetest\conetest_t_cone1.script,            600
-TESTEXECUTE, C:\logs\testexecute\conetest_t_cone2.htm,          	, z:\conetest\conetest_t_cone2.script,            600
-TESTEXECUTE, C:\logs\testexecute\conetest_t_cone3.htm,          	, z:\conetest\conetest_t_cone3.script,            600
-TESTEXECUTE, C:\logs\testexecute\conetest_t_cone4exe.htm,       	, z:\conetest\conetest_t_cone4exe.script,         600
-TESTEXECUTE, C:\logs\testexecute\conetest_t_cone5.htm,          	, z:\conetest\conetest_t_cone5.script,            600
-TESTEXECUTE, C:\logs\testexecute\conetest_t_cone6.htm,          	, z:\conetest\conetest_t_cone6.script,            600
-TESTEXECUTE, C:\logs\testexecute\conetest_t_cone7.htm,          	, z:\conetest\conetest_t_cone7.script,            600
-TESTEXECUTE, C:\logs\testexecute\conetest_t_conecoecntss.htm, 		, z:\conetest\conetest_t_conecoecntss.script,     600
-TESTEXECUTE, C:\logs\testexecute\conetest_t_coneerrormsg.htm,   	, z:\conetest\conetest_t_coneerrormsg.script,     600
-TESTEXECUTE, C:\logs\testexecute\conetest_t_conehelptext.htm,   	, z:\conetest\conetest_t_conehelptext.script,     600
-TESTEXECUTE, C:\logs\testexecute\conetest_t_coneinvalidate.htm, 	, z:\conetest\conetest_t_coneinvalidate.script,   600
-TESTEXECUTE, C:\logs\testexecute\conetest_t_conetransition.htm, 	, z:\conetest\conetest_t_conetransition.script,   600
-TESTEXECUTE, C:\logs\testexecute\conetest_t_conevisibility.htm, 	, z:\conetest\conetest_t_conevisibility.script,   600
-TESTEXECUTE, C:\logs\testexecute\conetest_t_conezoomfont.htm,   	, z:\conetest\conetest_t_conezoomfont.script,     600
-TESTEXECUTE, C:\logs\testexecute\conetest_t_multiplescreens.htm,	, z:\conetest\conetest_t_multiplescreens.script,  600, , z\appfwk\test\mulscreens_sw_test.cmd install, z\appfwk\test\mulscreens_sw_test.cmd uninstall
-TESTEXECUTE, C:\logs\testexecute\conetest_t_coneresourceloader.htm,	, z:\conetest\conetest_t_coneresourceloader.script,  800
-TESTEXECUTE, C:\logs\testexecute\conetest_t_conestateobs.htm,	, z:\conetest\conetest_t_conestateobs.script,  800
-TESTEXECUTE, C:\logs\testexecute\conetest_t_conetransparency.htm,	, z:\conetest\conetest_t_conetransparency.script,  600
-
-# CONE MENU TESTS
-TESTEXECUTE, C:\logs\testexecute\menutest_t_menu0.htm,          , z:\conetest\menutest_t_menu0.script,            600
-TESTEXECUTE, C:\logs\testexecute\menutest_t_menu1.htm,          , z:\conetest\menutest_t_menu1.script,            600
-TESTEXECUTE, C:\logs\testexecute\menutest_t_vwa.htm,            , z:\conetest\menutest_t_vwa.script,              600
-
-# EGUL TESTS
-TESTEXECUTE, C:\logs\testexecute\egultest_t_alignment.htm,      , z:\egultest\egultest_t_alignment.script,        600
-TESTEXECUTE, C:\logs\testexecute\egultest_t_border.htm,         , z:\egultest\egultest_t_border.script,           600
-TESTEXECUTE, C:\logs\testexecute\egultest_t_color.htm,          , z:\egultest\egultest_t_color.script,            600
-TESTEXECUTE, C:\logs\testexecute\egultest_t_digitwidth.htm,     , z:\egultest\egultest_t_digitwidth.script,       600
-
-# ETUL TESTS
-TESTEXECUTE, C:\logs\testexecute\etultest_t_addressstringtokenizer.htm,      ,z:\etultest\etultest_t_addressstringtokenizer.script,        800
-TESTEXECUTE, C:\logs\testexecute\etultest_t_phonenumberutils.htm,         , z:\etultest\etultest_t_phonenumberutils.script,           800
-TESTEXECUTE, C:\logs\testexecute\etultest_t_textresourceutils.htm,          , z:\etultest\etultest_t_textresourceutils.script,            800
-
-# FEPBASE TESTS
-TESTEXECUTE, C:\logs\testexecute\fepbasetest_t_appmorse.htm,    , z:\fepbasetest\fepbasetest_t_appmorse.script,   600
-TESTEXECUTE, C:\logs\testexecute\fepbasetest_t_fepgen.htm,      , z:\fepbasetest\fepbasetest_t_fepgen.script,     600
-
-# FEP TESTS
-TESTEXECUTE, C:\logs\testexecute\fepbasetest_t_defocusingedwin.htm, , z:\fepbasetest\fepbasetest_t_defocusingedwin.script,    600
-TESTEXECUTE, C:\logs\testexecute\fepbasetest_t_fep1testtarget.htm,  , z:\fepbasetest\fepbasetest_t_fep1testtarget.script,     600
-TESTEXECUTE, C:\logs\testexecute\fepbasetest_t_keyboardlogger.htm,  , z:\fepbasetest\fepbasetest_t_keyboardlogger.script,     600
-
-# GFXTRANSEFFECT TESTS
-TESTEXECUTE, C:\logs\testexecute\gfxtranstest_t_gfxtranseffect.htm, , z:\gfxtranstest\gfxtranstest_t_gfxtranseffect.script,    800
-
-# GRID TESTS
-TESTEXECUTE, C:\logs\testexecute\gridtest_t_cogrid.htm,         , z:\gridtest\gridtest_t_cogrid.script,           600
-TESTEXECUTE, C:\logs\testexecute\gridtest_t_glay.htm,           , z:\gridtest\gridtest_t_glay.script,             600
-TESTEXECUTE, C:\logs\testexecute\gridtest_t_grid0.htm,          , z:\gridtest\gridtest_t_grid0.script,            600
-
-# PRINT TESTS
-TESTEXECUTE, C:\logs\testexecute\printtest_t_fpr.htm,           , z:\printtest\printtest_t_fpr.script,            600
-TESTEXECUTE, C:\logs\testexecute\printtest_t_stream.htm,        , z:\printtest\printtest_t_stream.script,         600
-
-# UIK TESTS
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_addlibrary.htm,                , z:\uiktest\uiktest_t_addlibrary.script,                600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_applicationlanguage.htm,       , z:\uiktest\uiktest_t_applicationlanguage.script,       600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_applicationlanguagefrench.htm, , z:\uiktest\uiktest_t_applicationlanguagefrench.script, 600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_applicationlanguagenotset.htm, , z:\uiktest\uiktest_t_applicationlanguagenotset.script, 600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_applicationlanguagesc.htm,     , z:\uiktest\uiktest_t_applicationlanguagesc.script,     600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_applicationlanguagezulu.htm,   , z:\uiktest\uiktest_t_applicationlanguagezulu.script,   600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_autoLib.htm,                   , z:\uiktest\uiktest_t_autoLib.script,                   600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_backup.htm,      			  , z:\uiktest\uiktest_t_backup.script,      			   600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_brdrcol.htm,                   , z:\uiktest\uiktest_t_brdrcol.script,                   600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_capability1.htm,               , z:\uiktest\uiktest_t_capability1.script,               600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_capability2.htm,               , z:\uiktest\uiktest_t_capability2.script,               600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_colovr.htm,                    , z:\uiktest\uiktest_t_colovr.script,                    600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_colscm.htm,                    , z:\uiktest\uiktest_t_colscm.script,                    600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_disableexitchecks.htm,         , z:\uiktest\uiktest_t_disableexitchecks.script,         600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_eikenv.htm,                    , z:\uiktest\uiktest_t_eikenv.script,                    600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_error.htm,                     , z:\uiktest\uiktest_t_error.script,                     600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_fileutils.htm,                 , z:\uiktest\uiktest_t_fileutils.script,                 600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_focus.htm,                     , z:\uiktest\uiktest_t_focus.script,                     600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_hlsprite.htm,                  , z:\uiktest\uiktest_t_hlsprite.script,                  600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_msg.htm,                       , z:\uiktest\uiktest_t_msg.script,                       600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_multiplealarm.htm,         	  , z:\uiktest\uiktest_t_multiplealarm.script,        	   600, ,z\uiktest\multiplealarm_setup.bat install, z\uiktest\multiplealarm_setup.bat uninstall
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_nonfocus.htm,                  , z:\uiktest\uiktest_t_nonfocus.script,                  600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_notdial.htm,                   , z:\uiktest\uiktest_t_notdial.script,                   600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_package.htm,                   , z:\uiktest\uiktest_t_package.script,                   600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_parent.htm,                    , z:\uiktest\uiktest_t_parent.script,                    600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_shutter.htm,                   , z:\uiktest\uiktest_t_shutter.script,                   600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_spane.htm,                     , z:\uiktest\uiktest_t_spane.script,                     600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_syscolor.htm,         		  , z:\uiktest\uiktest_t_syscolor.script,                  600
-
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/uiftestfw/automation/testlists/emulator/tests_sw_core.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/uiftestfw/automation/testlists/emulator/tests_sw_core.txt	Fri Apr 16 15:08:06 2010 +0300
@@ -0,0 +1,129 @@
+# tests_sw_core.txt
+# Copyright (c) 2007-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:
+# program,log,commdb,script,timeout,release,pre cmd,post cmd
+
+# NOTE: Execution order is essentially alphabetical, except where noted.
+
+# DUMMY TEST 
+# workaround for DEF059510 to prevent first test case randomly failing
+appfwk_test_dummytest, epocwind.out, , , 180
+
+# ANIMATION TESTS
+TESTEXECUTE, C:\logs\testexecute\animationtest_t_basic.htm,     , z:\animationtest\animationtest_t_basic.script,  600
+TESTEXECUTE, C:\logs\testexecute\animationtest_t_custom.htm,    , z:\animationtest\animationtest_t_custom.script, 600
+TESTEXECUTE, C:\logs\testexecute\animationtest_t_frames.htm,    , z:\animationtest\animationtest_t_frames.script, 600
+TESTEXECUTE, C:\logs\testexecute\animationtest_t_mng.htm,       , z:\animationtest\animationtest_t_mng.script,    600
+TESTEXECUTE, C:\logs\testexecute\animationtest_t_oom.htm,       , z:\animationtest\animationtest_t_oom.script,    600
+TESTEXECUTE, C:\logs\testexecute\animationtest_t_synch.htm,     , z:\animationtest\animationtest_t_synch.script,  600
+
+# BMPANIM TESTS
+TESTEXECUTE, C:\logs\testexecute\bmpanimtest_t_autoan.htm,      , z:\bmpanimtest\bmpanimtest_t_autoan.script,     600
+TESTEXECUTE, C:\logs\testexecute\bmpanimtest_t_bmpanim.htm,     , z:\bmpanimtest\bmpanimtest_t_bmpanim.script,    600
+
+# CLOCK TESTS
+TESTEXECUTE, C:\logs\testexecute\clocktest_t_clck0.htm,         , z:\clocktest\clocktest_t_clck0.script,          600
+TESTEXECUTE, C:\logs\testexecute\clocktest_t_clck1.htm,         , z:\clocktest\clocktest_t_clck1.script,          600
+TESTEXECUTE, C:\logs\testexecute\clocktest_t_msgwin0.htm,       , z:\clocktest\clocktest_t_msgwin0.script,        600
+
+# CONE TESTS
+TESTEXECUTE, C:\logs\testexecute\conetest_t_background.htm,     	, z:\conetest\conetest_t_background.script,       600
+TESTEXECUTE, C:\logs\testexecute\conetest_t_coedatastorage.htm, 	, z:\conetest\conetest_t_coedatastorage.script,   600
+TESTEXECUTE, C:\logs\testexecute\conetest_t_cone0.htm,          	, z:\conetest\conetest_t_cone0.script,            600
+TESTEXECUTE, C:\logs\testexecute\conetest_t_cone1.htm,          	, z:\conetest\conetest_t_cone1.script,            600
+TESTEXECUTE, C:\logs\testexecute\conetest_t_cone2.htm,          	, z:\conetest\conetest_t_cone2.script,            600
+TESTEXECUTE, C:\logs\testexecute\conetest_t_cone3.htm,          	, z:\conetest\conetest_t_cone3.script,            600
+TESTEXECUTE, C:\logs\testexecute\conetest_t_cone4exe.htm,       	, z:\conetest\conetest_t_cone4exe.script,         600
+TESTEXECUTE, C:\logs\testexecute\conetest_t_cone5.htm,          	, z:\conetest\conetest_t_cone5.script,            600
+TESTEXECUTE, C:\logs\testexecute\conetest_t_cone6.htm,          	, z:\conetest\conetest_t_cone6.script,            600
+TESTEXECUTE, C:\logs\testexecute\conetest_t_cone7.htm,          	, z:\conetest\conetest_t_cone7.script,            600
+TESTEXECUTE, C:\logs\testexecute\conetest_t_conecoecntss.htm, 		, z:\conetest\conetest_t_conecoecntss.script,     600
+TESTEXECUTE, C:\logs\testexecute\conetest_t_coneerrormsg.htm,   	, z:\conetest\conetest_t_coneerrormsg.script,     600
+TESTEXECUTE, C:\logs\testexecute\conetest_t_conehelptext.htm,   	, z:\conetest\conetest_t_conehelptext.script,     600
+TESTEXECUTE, C:\logs\testexecute\conetest_t_coneinvalidate.htm, 	, z:\conetest\conetest_t_coneinvalidate.script,   600
+TESTEXECUTE, C:\logs\testexecute\conetest_t_conetransition.htm, 	, z:\conetest\conetest_t_conetransition.script,   600
+TESTEXECUTE, C:\logs\testexecute\conetest_t_conevisibility.htm, 	, z:\conetest\conetest_t_conevisibility.script,   600
+TESTEXECUTE, C:\logs\testexecute\conetest_t_conezoomfont.htm,   	, z:\conetest\conetest_t_conezoomfont.script,     600
+TESTEXECUTE, C:\logs\testexecute\conetest_t_multiplescreens.htm,	, z:\conetest\conetest_t_multiplescreens.script,  600, , z\appfwk\test\mulscreens_sw_test.cmd install, z\appfwk\test\mulscreens_sw_test.cmd uninstall
+TESTEXECUTE, C:\logs\testexecute\conetest_t_coneresourceloader.htm,	, z:\conetest\conetest_t_coneresourceloader.script,  800
+TESTEXECUTE, C:\logs\testexecute\conetest_t_conestateobs.htm,	, z:\conetest\conetest_t_conestateobs.script,  800
+TESTEXECUTE, C:\logs\testexecute\conetest_t_conetransparency.htm,	, z:\conetest\conetest_t_conetransparency.script,  600
+
+# CONE MENU TESTS
+TESTEXECUTE, C:\logs\testexecute\menutest_t_menu0.htm,          , z:\conetest\menutest_t_menu0.script,            600
+TESTEXECUTE, C:\logs\testexecute\menutest_t_menu1.htm,          , z:\conetest\menutest_t_menu1.script,            600
+TESTEXECUTE, C:\logs\testexecute\menutest_t_vwa.htm,            , z:\conetest\menutest_t_vwa.script,              600
+
+# EGUL TESTS
+TESTEXECUTE, C:\logs\testexecute\egultest_t_alignment.htm,      , z:\egultest\egultest_t_alignment.script,        600
+TESTEXECUTE, C:\logs\testexecute\egultest_t_border.htm,         , z:\egultest\egultest_t_border.script,           600
+TESTEXECUTE, C:\logs\testexecute\egultest_t_color.htm,          , z:\egultest\egultest_t_color.script,            600
+TESTEXECUTE, C:\logs\testexecute\egultest_t_digitwidth.htm,     , z:\egultest\egultest_t_digitwidth.script,       600
+
+# ETUL TESTS
+TESTEXECUTE, C:\logs\testexecute\etultest_t_addressstringtokenizer.htm,      ,z:\etultest\etultest_t_addressstringtokenizer.script,        800
+TESTEXECUTE, C:\logs\testexecute\etultest_t_phonenumberutils.htm,         , z:\etultest\etultest_t_phonenumberutils.script,           800
+TESTEXECUTE, C:\logs\testexecute\etultest_t_textresourceutils.htm,          , z:\etultest\etultest_t_textresourceutils.script,            800
+
+# FEPBASE TESTS
+TESTEXECUTE, C:\logs\testexecute\fepbasetest_t_appmorse.htm,    , z:\fepbasetest\fepbasetest_t_appmorse.script,   600
+TESTEXECUTE, C:\logs\testexecute\fepbasetest_t_fepgen.htm,      , z:\fepbasetest\fepbasetest_t_fepgen.script,     600
+
+# FEP TESTS
+TESTEXECUTE, C:\logs\testexecute\fepbasetest_t_defocusingedwin.htm, , z:\fepbasetest\fepbasetest_t_defocusingedwin.script,    600
+TESTEXECUTE, C:\logs\testexecute\fepbasetest_t_fep1testtarget.htm,  , z:\fepbasetest\fepbasetest_t_fep1testtarget.script,     600
+TESTEXECUTE, C:\logs\testexecute\fepbasetest_t_keyboardlogger.htm,  , z:\fepbasetest\fepbasetest_t_keyboardlogger.script,     600
+
+# GFXTRANSEFFECT TESTS
+TESTEXECUTE, C:\logs\testexecute\gfxtranstest_t_gfxtranseffect.htm, , z:\gfxtranstest\gfxtranstest_t_gfxtranseffect.script,    800
+
+# GRID TESTS
+TESTEXECUTE, C:\logs\testexecute\gridtest_t_cogrid.htm,         , z:\gridtest\gridtest_t_cogrid.script,           600
+TESTEXECUTE, C:\logs\testexecute\gridtest_t_glay.htm,           , z:\gridtest\gridtest_t_glay.script,             600
+TESTEXECUTE, C:\logs\testexecute\gridtest_t_grid0.htm,          , z:\gridtest\gridtest_t_grid0.script,            600
+
+# PRINT TESTS
+TESTEXECUTE, C:\logs\testexecute\printtest_t_fpr.htm,           , z:\printtest\printtest_t_fpr.script,            600
+TESTEXECUTE, C:\logs\testexecute\printtest_t_stream.htm,        , z:\printtest\printtest_t_stream.script,         600
+
+# UIK TESTS
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_addlibrary.htm,                , z:\uiktest\uiktest_t_addlibrary.script,                600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_applicationlanguage.htm,       , z:\uiktest\uiktest_t_applicationlanguage.script,       600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_applicationlanguagefrench.htm, , z:\uiktest\uiktest_t_applicationlanguagefrench.script, 600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_applicationlanguagenotset.htm, , z:\uiktest\uiktest_t_applicationlanguagenotset.script, 600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_applicationlanguagesc.htm,     , z:\uiktest\uiktest_t_applicationlanguagesc.script,     600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_applicationlanguagezulu.htm,   , z:\uiktest\uiktest_t_applicationlanguagezulu.script,   600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_autoLib.htm,                   , z:\uiktest\uiktest_t_autoLib.script,                   600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_backup.htm,      			  , z:\uiktest\uiktest_t_backup.script,      			   600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_brdrcol.htm,                   , z:\uiktest\uiktest_t_brdrcol.script,                   600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_capability1.htm,               , z:\uiktest\uiktest_t_capability1.script,               600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_capability2.htm,               , z:\uiktest\uiktest_t_capability2.script,               600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_colovr.htm,                    , z:\uiktest\uiktest_t_colovr.script,                    600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_colscm.htm,                    , z:\uiktest\uiktest_t_colscm.script,                    600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_disableexitchecks.htm,         , z:\uiktest\uiktest_t_disableexitchecks.script,         600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_eikenv.htm,                    , z:\uiktest\uiktest_t_eikenv.script,                    600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_error.htm,                     , z:\uiktest\uiktest_t_error.script,                     600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_fileutils.htm,                 , z:\uiktest\uiktest_t_fileutils.script,                 600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_focus.htm,                     , z:\uiktest\uiktest_t_focus.script,                     600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_hlsprite.htm,                  , z:\uiktest\uiktest_t_hlsprite.script,                  600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_msg.htm,                       , z:\uiktest\uiktest_t_msg.script,                       600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_multiplealarm.htm,         	  , z:\uiktest\uiktest_t_multiplealarm.script,        	   600, ,z\uiktest\multiplealarm_setup.bat install, z\uiktest\multiplealarm_setup.bat uninstall
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_nonfocus.htm,                  , z:\uiktest\uiktest_t_nonfocus.script,                  600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_notdial.htm,                   , z:\uiktest\uiktest_t_notdial.script,                   600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_package.htm,                   , z:\uiktest\uiktest_t_package.script,                   600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_parent.htm,                    , z:\uiktest\uiktest_t_parent.script,                    600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_shutter.htm,                   , z:\uiktest\uiktest_t_shutter.script,                   600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_spane.htm,                     , z:\uiktest\uiktest_t_spane.script,                     600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_syscolor.htm,         		  , z:\uiktest\uiktest_t_syscolor.script,                  600
+
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/uiftestfw/automation/testlists/emulator/tests_sw_nga_enabled.py
--- a/appfw/uiftestfw/automation/testlists/emulator/tests_sw_nga_enabled.py	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-# tests_sw_nga_enabled.txt
-# Copyright (c) 1995-2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of the License "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:
-#
-# program,log,commdb,script,timeout,release,pre cmd,post cmd
-
-# NOTE: Execution order is essentially alphabetical, except where noted.
-
-TESTEXECUTE, C:\logs\testexecute\conetest_t_conemultiptr.htm,		, z:\conetest\conetest_t_conemultiptr.script,    800
-TESTEXECUTE, C:\logs\testexecute\conetest_t_conemultiptrcompound.htm,,z:\conetest\conetest_t_conemultiptrcompound.script,    800
-
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/uiftestfw/automation/testlists/emulator/tests_sw_nga_enabled.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/uiftestfw/automation/testlists/emulator/tests_sw_nga_enabled.txt	Fri Apr 16 15:08:06 2010 +0300
@@ -0,0 +1,21 @@
+# tests_sw_core.txt
+# Copyright (c) 2007-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:
+# program,log,commdb,script,timeout,release,pre cmd,post cmd
+
+# NOTE: Execution order is essentially alphabetical, except where noted.
+
+TESTEXECUTE, C:\logs\testexecute\conetest_t_conemultiptr.htm,		, z:\conetest\conetest_t_conemultiptr.script,    800
+TESTEXECUTE, C:\logs\testexecute\conetest_t_conemultiptrcompound.htm,,z:\conetest\conetest_t_conemultiptrcompound.script,    800
+
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/uiftestfw/automation/testlists/hardware/distribution.policy.s60
--- a/appfw/uiftestfw/automation/testlists/hardware/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/uiftestfw/automation/testlists/hardware/tests_hw_core.py
--- a/appfw/uiftestfw/automation/testlists/hardware/tests_hw_core.py	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,125 +0,0 @@
-# tests_hw_core.txt
-# Copyright (c) 1995-2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of the License "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:
-#
-# program,log,commdb,script,timeout,release,pre cmd,post cmd
-
-# NOTE: Execution order is essentially alphabetical, except where noted.
-
-# ANIMATION TESTS
-TESTEXECUTE, logs\testexecute\animationtest_t_basic.htm,     , z:\animationtest\animationtest_t_basic.script,  800
-TESTEXECUTE, logs\testexecute\animationtest_t_custom.htm,    , z:\animationtest\animationtest_t_custom.script, 800
-TESTEXECUTE, logs\testexecute\animationtest_t_frames.htm,    , z:\animationtest\animationtest_t_frames.script, 800
-TESTEXECUTE, logs\testexecute\animationtest_t_mng.htm,       , z:\animationtest\animationtest_t_mng.script,    800
-TESTEXECUTE, logs\testexecute\animationtest_t_oom.htm,       , z:\animationtest\animationtest_t_oom.script,    800
-TESTEXECUTE, logs\testexecute\animationtest_t_synch.htm,     , z:\animationtest\animationtest_t_synch.script,  800
-
-# BMPANIM TESTS
-TESTEXECUTE, logs\testexecute\bmpanimtest_t_autoan.htm,      , z:\bmpanimtest\bmpanimtest_t_autoan.script,     800
-TESTEXECUTE, logs\testexecute\bmpanimtest_t_bmpanim.htm,     , z:\bmpanimtest\bmpanimtest_t_bmpanim.script,    800
-
-# CLOCK TESTS
-TESTEXECUTE, logs\testexecute\clocktest_t_clck0.htm,         , z:\clocktest\clocktest_t_clck0.script,          800
-TESTEXECUTE, logs\testexecute\clocktest_t_clck1.htm,         , z:\clocktest\clocktest_t_clck1.script,          800
-TESTEXECUTE, logs\testexecute\clocktest_t_msgwin0.htm,       , z:\clocktest\clocktest_t_msgwin0.script,        800
-
-# CONE TESTS
-# Multiplescreens test is commented since hardware support wasn't available (yet) when PREQ1227 was submitted
-TESTEXECUTE, logs\testexecute\conetest_t_background.htm,     	, z:\conetest\conetest_t_background.script,       800
-TESTEXECUTE, logs\testexecute\conetest_t_coedatastorage.htm, 	, z:\conetest\conetest_t_coedatastorage.script,   800
-TESTEXECUTE, logs\testexecute\conetest_t_cone0.htm,          	, z:\conetest\conetest_t_cone0.script,            800
-TESTEXECUTE, logs\testexecute\conetest_t_cone1.htm,          	, z:\conetest\conetest_t_cone1.script,            800
-TESTEXECUTE, logs\testexecute\conetest_t_cone2.htm,          	, z:\conetest\conetest_t_cone2.script,            800
-TESTEXECUTE, logs\testexecute\conetest_t_cone3.htm,          	, z:\conetest\conetest_t_cone3.script,            800
-TESTEXECUTE, logs\testexecute\conetest_t_cone4exe.htm,       	, z:\conetest\conetest_t_cone4exe.script,         800
-TESTEXECUTE, logs\testexecute\conetest_t_cone5.htm,          	, z:\conetest\conetest_t_cone5.script,            800
-TESTEXECUTE, logs\testexecute\conetest_t_cone6.htm,          	, z:\conetest\conetest_t_cone6.script,            800
-TESTEXECUTE, logs\testexecute\conetest_t_cone7.htm,          	, z:\conetest\conetest_t_cone7.script,            800
-TESTEXECUTE, logs\testexecute\conetest_t_conecoecntss.htm, 	 	, z:\conetest\conetest_t_conecoecntss.script,     800
-TESTEXECUTE, logs\testexecute\conetest_t_coneerrormsg.htm,   	, z:\conetest\conetest_t_coneerrormsg.script,     800
-TESTEXECUTE, logs\testexecute\conetest_t_conehelptext.htm,   	, z:\conetest\conetest_t_conehelptext.script,     800
-TESTEXECUTE, logs\testexecute\conetest_t_coneinvalidate.htm, 	, z:\conetest\conetest_t_coneinvalidate.script,   800
-TESTEXECUTE, logs\testexecute\conetest_t_conetransition.htm, 	, z:\conetest\conetest_t_conetransition.script,   800
-TESTEXECUTE, logs\testexecute\conetest_t_conevisibility.htm, 	, z:\conetest\conetest_t_conevisibility.script,   800
-TESTEXECUTE, logs\testexecute\conetest_t_conezoomfont.htm,   	, z:\conetest\conetest_t_conezoomfont.script,     800
-TESTEXECUTE, logs\testexecute\conetest_t_multiplescreens.htm,	, z:\conetest\conetest_t_multiplescreens.script,  800
-TESTEXECUTE, logs\testexecute\conetest_t_coneresourceloader.htm,	, z:\conetest\conetest_t_coneresourceloader.script,  800
-TESTEXECUTE, logs\testexecute\conetest_t_conestateobs.htm,	, z:\conetest\conetest_t_conestateobs.script,  800
-TESTEXECUTE, logs\testexecute\conetest_t_conetransparency.htm,	, z:\conetest\conetest_t_conetransparency.script,  600
-
-# CONE MENU TESTS
-TESTEXECUTE, logs\testexecute\menutest_t_menu0.htm,          , z:\conetest\menutest_t_menu0.script,            800
-TESTEXECUTE, logs\testexecute\menutest_t_menu1.htm,          , z:\conetest\menutest_t_menu1.script,            800
-TESTEXECUTE, logs\testexecute\menutest_t_vwa.htm,            , z:\conetest\menutest_t_vwa.script,              800
-
-# EGUL TESTS
-TESTEXECUTE, logs\testexecute\egultest_t_alignment.htm,      , z:\egultest\egultest_t_alignment.script,        800
-TESTEXECUTE, logs\testexecute\egultest_t_border.htm,         , z:\egultest\egultest_t_border.script,           800
-TESTEXECUTE, logs\testexecute\egultest_t_color.htm,          , z:\egultest\egultest_t_color.script,            800
-TESTEXECUTE, logs\testexecute\egultest_t_digitwidth.htm,     , z:\egultest\egultest_t_digitwidth.script,       800
-# ETUL TESTS
-TESTEXECUTE, logs\testexecute\etultest_t_addressstringtokenizer.htm,      ,z:\etultest\etultest_t_addressstringtokenizer.script,        800
-TESTEXECUTE, logs\testexecute\etultest_t_phonenumberutils.htm,         , z:\etultest\etultest_t_phonenumberutils.script,           800
-TESTEXECUTE, logs\testexecute\etultest_t_textresourceutils.htm,          , z:\etultest\etultest_t_textresourceutils.script,            800
-
-# FEPBASE TESTS
-TESTEXECUTE, logs\testexecute\fepbasetest_t_appmorse.htm,    , z:\fepbasetest\fepbasetest_t_appmorse.script,   800
-TESTEXECUTE, logs\testexecute\fepbasetest_t_fepgen.htm,      , z:\fepbasetest\fepbasetest_t_fepgen.script,     800
-
-# FEP TESTS
-TESTEXECUTE, logs\testexecute\fepbasetest_t_defocusingedwin.htm, , z:\fepbasetest\fepbasetest_t_defocusingedwin.script,    800
-TESTEXECUTE, logs\testexecute\fepbasetest_t_fep1testtarget.htm,  , z:\fepbasetest\fepbasetest_t_fep1testtarget.script,     800
-TESTEXECUTE, logs\testexecute\fepbasetest_t_keyboardlogger.htm,  , z:\fepbasetest\fepbasetest_t_keyboardlogger.script,     800
-
-# GFXTRANSEFFECT TESTS
-TESTEXECUTE, logs\testexecute\gfxtranstest_t_gfxtranseffect.htm, , z:\gfxtranstest\gfxtranstest_t_gfxtranseffect.script,    800
-
-# GRID TESTS
-TESTEXECUTE, logs\testexecute\gridtest_t_cogrid.htm,         , z:\gridtest\gridtest_t_cogrid.script,           800
-TESTEXECUTE, logs\testexecute\gridtest_t_glay.htm,           , z:\gridtest\gridtest_t_glay.script,             800
-TESTEXECUTE, logs\testexecute\gridtest_t_grid0.htm,          , z:\gridtest\gridtest_t_grid0.script,            800
-
-# PRINT TESTS
-TESTEXECUTE, logs\testexecute\printtest_t_fpr.htm,           , z:\printtest\printtest_t_fpr.script,            800
-TESTEXECUTE, logs\testexecute\printtest_t_stream.htm,        , z:\printtest\printtest_t_stream.script,         800
-
-# UIK TESTS
-TESTEXECUTE, logs\testexecute\uiktest_t_addlibrary.htm,                , z:\uiktest\uiktest_t_addlibrary.script,                800
-TESTEXECUTE, logs\testexecute\uiktest_t_applicationlanguage.htm,       , z:\uiktest\uiktest_t_applicationlanguage.script,       800
-TESTEXECUTE, logs\testexecute\uiktest_t_applicationlanguagefrench.htm, , z:\uiktest\uiktest_t_applicationlanguagefrench.script, 800
-TESTEXECUTE, logs\testexecute\uiktest_t_applicationlanguagenotset.htm, , z:\uiktest\uiktest_t_applicationlanguagenotset.script, 800
-TESTEXECUTE, logs\testexecute\uiktest_t_applicationlanguagesc.htm,     , z:\uiktest\uiktest_t_applicationlanguagesc.script,     800
-TESTEXECUTE, logs\testexecute\uiktest_t_applicationlanguagezulu.htm,   , z:\uiktest\uiktest_t_applicationlanguagezulu.script,   800
-TESTEXECUTE, logs\testexecute\uiktest_t_autoLib.htm,                   , z:\uiktest\uiktest_t_autoLib.script,                   800
-TESTEXECUTE, logs\testexecute\uiktest_t_backup.htm,      			   , z:\uiktest\uiktest_t_backup.script,      			    800
-TESTEXECUTE, logs\testexecute\uiktest_t_brdrcol.htm,                   , z:\uiktest\uiktest_t_brdrcol.script,                   800
-TESTEXECUTE, logs\testexecute\uiktest_t_capability1.htm,               , z:\uiktest\uiktest_t_capability1.script,               800
-TESTEXECUTE, logs\testexecute\uiktest_t_capability2.htm,     		   , z:\uiktest\uiktest_t_capability2.script,        		800
-TESTEXECUTE, logs\testexecute\uiktest_t_colovr.htm,                    , z:\uiktest\uiktest_t_colovr.script,                    800
-TESTEXECUTE, logs\testexecute\uiktest_t_colscm.htm,        			   , z:\uiktest\uiktest_t_colscm.script,             		800
-TESTEXECUTE, logs\testexecute\uiktest_t_disableexitchecks.htm,         , z:\uiktest\uiktest_t_disableexitchecks.script,         800
-TESTEXECUTE, logs\testexecute\uiktest_t_eikenv.htm,                    , z:\uiktest\uiktest_t_eikenv.script,                    800
-TESTEXECUTE, logs\testexecute\uiktest_t_error.htm,                     , z:\uiktest\uiktest_t_error.script,                     800
-TESTEXECUTE, logs\testexecute\uiktest_t_fileutils.htm,                 , z:\uiktest\uiktest_t_fileutils.script,                 800
-TESTEXECUTE, logs\testexecute\uiktest_t_focus.htm,                     , z:\uiktest\uiktest_t_focus.script,                     800
-TESTEXECUTE, logs\testexecute\uiktest_t_hlsprite.htm,                  , z:\uiktest\uiktest_t_hlsprite.script,                  800
-TESTEXECUTE, logs\testexecute\uiktest_t_msg.htm,                       , z:\uiktest\uiktest_t_msg.script,                       800
-TESTEXECUTE, logs\testexecute\uiktest_t_nonfocus.htm,                  , z:\uiktest\uiktest_t_nonfocus.script,                  800
-TESTEXECUTE, logs\testexecute\uiktest_t_notdial.htm,                   , z:\uiktest\uiktest_t_notdial.script,                   800
-TESTEXECUTE, logs\testexecute\uiktest_t_package.htm,                   , z:\uiktest\uiktest_t_package.script,                   800
-TESTEXECUTE, logs\testexecute\uiktest_t_parent.htm,                    , z:\uiktest\uiktest_t_parent.script,   	            	800
-TESTEXECUTE, logs\testexecute\uiktest_t_shutter.htm,                   , z:\uiktest\uiktest_t_shutter.script,                   800
-TESTEXECUTE, logs\testexecute\uiktest_t_spane.htm,                     , z:\uiktest\uiktest_t_spane.script,                     800
-TESTEXECUTE, logs\testexecute\uiktest_t_syscolor.htm,        		   , z:\uiktest\uiktest_t_syscolor.script,           		800
-
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/uiftestfw/automation/testlists/hardware/tests_hw_core.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/uiftestfw/automation/testlists/hardware/tests_hw_core.txt	Fri Apr 16 15:08:06 2010 +0300
@@ -0,0 +1,124 @@
+# tests_hw_core.txt
+# Copyright (c) 2007-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:
+# program,log,commdb,script,timeout,release,pre cmd,post cmd
+
+# NOTE: Execution order is essentially alphabetical, except where noted.
+
+# ANIMATION TESTS
+TESTEXECUTE, logs\testexecute\animationtest_t_basic.htm,     , z:\animationtest\animationtest_t_basic.script,  800
+TESTEXECUTE, logs\testexecute\animationtest_t_custom.htm,    , z:\animationtest\animationtest_t_custom.script, 800
+TESTEXECUTE, logs\testexecute\animationtest_t_frames.htm,    , z:\animationtest\animationtest_t_frames.script, 800
+TESTEXECUTE, logs\testexecute\animationtest_t_mng.htm,       , z:\animationtest\animationtest_t_mng.script,    800
+TESTEXECUTE, logs\testexecute\animationtest_t_oom.htm,       , z:\animationtest\animationtest_t_oom.script,    800
+TESTEXECUTE, logs\testexecute\animationtest_t_synch.htm,     , z:\animationtest\animationtest_t_synch.script,  800
+
+# BMPANIM TESTS
+TESTEXECUTE, logs\testexecute\bmpanimtest_t_autoan.htm,      , z:\bmpanimtest\bmpanimtest_t_autoan.script,     800
+TESTEXECUTE, logs\testexecute\bmpanimtest_t_bmpanim.htm,     , z:\bmpanimtest\bmpanimtest_t_bmpanim.script,    800
+
+# CLOCK TESTS
+TESTEXECUTE, logs\testexecute\clocktest_t_clck0.htm,         , z:\clocktest\clocktest_t_clck0.script,          800
+TESTEXECUTE, logs\testexecute\clocktest_t_clck1.htm,         , z:\clocktest\clocktest_t_clck1.script,          800
+TESTEXECUTE, logs\testexecute\clocktest_t_msgwin0.htm,       , z:\clocktest\clocktest_t_msgwin0.script,        800
+
+# CONE TESTS
+# Multiplescreens test is commented since hardware support wasn't available (yet) when PREQ1227 was submitted
+TESTEXECUTE, logs\testexecute\conetest_t_background.htm,     	, z:\conetest\conetest_t_background.script,       800
+TESTEXECUTE, logs\testexecute\conetest_t_coedatastorage.htm, 	, z:\conetest\conetest_t_coedatastorage.script,   800
+TESTEXECUTE, logs\testexecute\conetest_t_cone0.htm,          	, z:\conetest\conetest_t_cone0.script,            800
+TESTEXECUTE, logs\testexecute\conetest_t_cone1.htm,          	, z:\conetest\conetest_t_cone1.script,            800
+TESTEXECUTE, logs\testexecute\conetest_t_cone2.htm,          	, z:\conetest\conetest_t_cone2.script,            800
+TESTEXECUTE, logs\testexecute\conetest_t_cone3.htm,          	, z:\conetest\conetest_t_cone3.script,            800
+TESTEXECUTE, logs\testexecute\conetest_t_cone4exe.htm,       	, z:\conetest\conetest_t_cone4exe.script,         800
+TESTEXECUTE, logs\testexecute\conetest_t_cone5.htm,          	, z:\conetest\conetest_t_cone5.script,            800
+TESTEXECUTE, logs\testexecute\conetest_t_cone6.htm,          	, z:\conetest\conetest_t_cone6.script,            800
+TESTEXECUTE, logs\testexecute\conetest_t_cone7.htm,          	, z:\conetest\conetest_t_cone7.script,            800
+TESTEXECUTE, logs\testexecute\conetest_t_conecoecntss.htm, 	 	, z:\conetest\conetest_t_conecoecntss.script,     800
+TESTEXECUTE, logs\testexecute\conetest_t_coneerrormsg.htm,   	, z:\conetest\conetest_t_coneerrormsg.script,     800
+TESTEXECUTE, logs\testexecute\conetest_t_conehelptext.htm,   	, z:\conetest\conetest_t_conehelptext.script,     800
+TESTEXECUTE, logs\testexecute\conetest_t_coneinvalidate.htm, 	, z:\conetest\conetest_t_coneinvalidate.script,   800
+TESTEXECUTE, logs\testexecute\conetest_t_conetransition.htm, 	, z:\conetest\conetest_t_conetransition.script,   800
+TESTEXECUTE, logs\testexecute\conetest_t_conevisibility.htm, 	, z:\conetest\conetest_t_conevisibility.script,   800
+TESTEXECUTE, logs\testexecute\conetest_t_conezoomfont.htm,   	, z:\conetest\conetest_t_conezoomfont.script,     800
+TESTEXECUTE, logs\testexecute\conetest_t_multiplescreens.htm,	, z:\conetest\conetest_t_multiplescreens.script,  800
+TESTEXECUTE, logs\testexecute\conetest_t_coneresourceloader.htm,	, z:\conetest\conetest_t_coneresourceloader.script,  800
+TESTEXECUTE, logs\testexecute\conetest_t_conestateobs.htm,	, z:\conetest\conetest_t_conestateobs.script,  800
+TESTEXECUTE, logs\testexecute\conetest_t_conetransparency.htm,	, z:\conetest\conetest_t_conetransparency.script,  600
+
+# CONE MENU TESTS
+TESTEXECUTE, logs\testexecute\menutest_t_menu0.htm,          , z:\conetest\menutest_t_menu0.script,            800
+TESTEXECUTE, logs\testexecute\menutest_t_menu1.htm,          , z:\conetest\menutest_t_menu1.script,            800
+TESTEXECUTE, logs\testexecute\menutest_t_vwa.htm,            , z:\conetest\menutest_t_vwa.script,              800
+
+# EGUL TESTS
+TESTEXECUTE, logs\testexecute\egultest_t_alignment.htm,      , z:\egultest\egultest_t_alignment.script,        800
+TESTEXECUTE, logs\testexecute\egultest_t_border.htm,         , z:\egultest\egultest_t_border.script,           800
+TESTEXECUTE, logs\testexecute\egultest_t_color.htm,          , z:\egultest\egultest_t_color.script,            800
+TESTEXECUTE, logs\testexecute\egultest_t_digitwidth.htm,     , z:\egultest\egultest_t_digitwidth.script,       800
+# ETUL TESTS
+TESTEXECUTE, logs\testexecute\etultest_t_addressstringtokenizer.htm,      ,z:\etultest\etultest_t_addressstringtokenizer.script,        800
+TESTEXECUTE, logs\testexecute\etultest_t_phonenumberutils.htm,         , z:\etultest\etultest_t_phonenumberutils.script,           800
+TESTEXECUTE, logs\testexecute\etultest_t_textresourceutils.htm,          , z:\etultest\etultest_t_textresourceutils.script,            800
+
+# FEPBASE TESTS
+TESTEXECUTE, logs\testexecute\fepbasetest_t_appmorse.htm,    , z:\fepbasetest\fepbasetest_t_appmorse.script,   800
+TESTEXECUTE, logs\testexecute\fepbasetest_t_fepgen.htm,      , z:\fepbasetest\fepbasetest_t_fepgen.script,     800
+
+# FEP TESTS
+TESTEXECUTE, logs\testexecute\fepbasetest_t_defocusingedwin.htm, , z:\fepbasetest\fepbasetest_t_defocusingedwin.script,    800
+TESTEXECUTE, logs\testexecute\fepbasetest_t_fep1testtarget.htm,  , z:\fepbasetest\fepbasetest_t_fep1testtarget.script,     800
+TESTEXECUTE, logs\testexecute\fepbasetest_t_keyboardlogger.htm,  , z:\fepbasetest\fepbasetest_t_keyboardlogger.script,     800
+
+# GFXTRANSEFFECT TESTS
+TESTEXECUTE, logs\testexecute\gfxtranstest_t_gfxtranseffect.htm, , z:\gfxtranstest\gfxtranstest_t_gfxtranseffect.script,    800
+
+# GRID TESTS
+TESTEXECUTE, logs\testexecute\gridtest_t_cogrid.htm,         , z:\gridtest\gridtest_t_cogrid.script,           800
+TESTEXECUTE, logs\testexecute\gridtest_t_glay.htm,           , z:\gridtest\gridtest_t_glay.script,             800
+TESTEXECUTE, logs\testexecute\gridtest_t_grid0.htm,          , z:\gridtest\gridtest_t_grid0.script,            800
+
+# PRINT TESTS
+TESTEXECUTE, logs\testexecute\printtest_t_fpr.htm,           , z:\printtest\printtest_t_fpr.script,            800
+TESTEXECUTE, logs\testexecute\printtest_t_stream.htm,        , z:\printtest\printtest_t_stream.script,         800
+
+# UIK TESTS
+TESTEXECUTE, logs\testexecute\uiktest_t_addlibrary.htm,                , z:\uiktest\uiktest_t_addlibrary.script,                800
+TESTEXECUTE, logs\testexecute\uiktest_t_applicationlanguage.htm,       , z:\uiktest\uiktest_t_applicationlanguage.script,       800
+TESTEXECUTE, logs\testexecute\uiktest_t_applicationlanguagefrench.htm, , z:\uiktest\uiktest_t_applicationlanguagefrench.script, 800
+TESTEXECUTE, logs\testexecute\uiktest_t_applicationlanguagenotset.htm, , z:\uiktest\uiktest_t_applicationlanguagenotset.script, 800
+TESTEXECUTE, logs\testexecute\uiktest_t_applicationlanguagesc.htm,     , z:\uiktest\uiktest_t_applicationlanguagesc.script,     800
+TESTEXECUTE, logs\testexecute\uiktest_t_applicationlanguagezulu.htm,   , z:\uiktest\uiktest_t_applicationlanguagezulu.script,   800
+TESTEXECUTE, logs\testexecute\uiktest_t_autoLib.htm,                   , z:\uiktest\uiktest_t_autoLib.script,                   800
+TESTEXECUTE, logs\testexecute\uiktest_t_backup.htm,      			   , z:\uiktest\uiktest_t_backup.script,      			    800
+TESTEXECUTE, logs\testexecute\uiktest_t_brdrcol.htm,                   , z:\uiktest\uiktest_t_brdrcol.script,                   800
+TESTEXECUTE, logs\testexecute\uiktest_t_capability1.htm,               , z:\uiktest\uiktest_t_capability1.script,               800
+TESTEXECUTE, logs\testexecute\uiktest_t_capability2.htm,     		   , z:\uiktest\uiktest_t_capability2.script,        		800
+TESTEXECUTE, logs\testexecute\uiktest_t_colovr.htm,                    , z:\uiktest\uiktest_t_colovr.script,                    800
+TESTEXECUTE, logs\testexecute\uiktest_t_colscm.htm,        			   , z:\uiktest\uiktest_t_colscm.script,             		800
+TESTEXECUTE, logs\testexecute\uiktest_t_disableexitchecks.htm,         , z:\uiktest\uiktest_t_disableexitchecks.script,         800
+TESTEXECUTE, logs\testexecute\uiktest_t_eikenv.htm,                    , z:\uiktest\uiktest_t_eikenv.script,                    800
+TESTEXECUTE, logs\testexecute\uiktest_t_error.htm,                     , z:\uiktest\uiktest_t_error.script,                     800
+TESTEXECUTE, logs\testexecute\uiktest_t_fileutils.htm,                 , z:\uiktest\uiktest_t_fileutils.script,                 800
+TESTEXECUTE, logs\testexecute\uiktest_t_focus.htm,                     , z:\uiktest\uiktest_t_focus.script,                     800
+TESTEXECUTE, logs\testexecute\uiktest_t_hlsprite.htm,                  , z:\uiktest\uiktest_t_hlsprite.script,                  800
+TESTEXECUTE, logs\testexecute\uiktest_t_msg.htm,                       , z:\uiktest\uiktest_t_msg.script,                       800
+TESTEXECUTE, logs\testexecute\uiktest_t_nonfocus.htm,                  , z:\uiktest\uiktest_t_nonfocus.script,                  800
+TESTEXECUTE, logs\testexecute\uiktest_t_notdial.htm,                   , z:\uiktest\uiktest_t_notdial.script,                   800
+TESTEXECUTE, logs\testexecute\uiktest_t_package.htm,                   , z:\uiktest\uiktest_t_package.script,                   800
+TESTEXECUTE, logs\testexecute\uiktest_t_parent.htm,                    , z:\uiktest\uiktest_t_parent.script,   	            	800
+TESTEXECUTE, logs\testexecute\uiktest_t_shutter.htm,                   , z:\uiktest\uiktest_t_shutter.script,                   800
+TESTEXECUTE, logs\testexecute\uiktest_t_spane.htm,                     , z:\uiktest\uiktest_t_spane.script,                     800
+TESTEXECUTE, logs\testexecute\uiktest_t_syscolor.htm,        		   , z:\uiktest\uiktest_t_syscolor.script,           		800
+
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/uiftestfw/automation/testlists/hardware/tests_hw_nga_enabled.py
--- a/appfw/uiftestfw/automation/testlists/hardware/tests_hw_nga_enabled.py	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-# tests_hw_nga_enabled.txt
-# Copyright (c) 1995-2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of the License "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:
-#
-# program,log,commdb,script,timeout,release,pre cmd,post cmd
-
-# NOTE: Execution order is essentially alphabetical, except where noted.
-
-TESTEXECUTE, logs\testexecute\conetest_t_conemultiptr.htm,			, z:\conetest\conetest_t_conemultiptr.script,  800
-TESTEXECUTE, logs\testexecute\conetest_t_conemultiptrcompound.htm,	, z:\conetest\conetest_t_conemultiptrcompound.script,  800
-
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/uiftestfw/automation/testlists/hardware/tests_hw_nga_enabled.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/uiftestfw/automation/testlists/hardware/tests_hw_nga_enabled.txt	Fri Apr 16 15:08:06 2010 +0300
@@ -0,0 +1,21 @@
+# tests_hw_nga_enabled.txt
+# Copyright (c) 2007-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:
+# program,log,commdb,script,timeout,release,pre cmd,post cmd
+
+# NOTE: Execution order is essentially alphabetical, except where noted.
+
+TESTEXECUTE, logs\testexecute\conetest_t_conemultiptr.htm,			, z:\conetest\conetest_t_conemultiptr.script,  800
+TESTEXECUTE, logs\testexecute\conetest_t_conemultiptrcompound.htm,	, z:\conetest\conetest_t_conemultiptrcompound.script,  800
+
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/uiftestfw/bwins/distribution.policy.s60
--- a/appfw/uiftestfw/bwins/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/uiftestfw/eabi/distribution.policy.s60
--- a/appfw/uiftestfw/eabi/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/uiftestfw/group/app-framework_testframework.mrp
--- a/appfw/uiftestfw/group/app-framework_testframework.mrp	Tue Feb 02 10:12:00 2010 +0200
+++ b/appfw/uiftestfw/group/app-framework_testframework.mrp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,3 +1,19 @@
+#
+# 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: 
+#
+
 component	app-framework_testframework
 source	\sf\mw\appsupport\appfw\uiftestfw
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/uiftestfw/group/distribution.policy.s60
--- a/appfw/uiftestfw/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/uiftestfw/inc/appfwk_test_AppUi.h
--- a/appfw/uiftestfw/inc/appfwk_test_AppUi.h	Tue Feb 02 10:12:00 2010 +0200
+++ b/appfw/uiftestfw/inc/appfwk_test_AppUi.h	Fri Apr 16 15:08:06 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2010 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"
@@ -30,7 +30,7 @@
 
 #include <test/testexecutestepbase.h>
 
-#include "appfwk_tmsteststep.h"
+#include <test/appfwk_tmsteststep.h>
 
 // user panic descriptors
 _LIT(KPanicNullPointer,"Null pointer");
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/uiftestfw/inc/distribution.policy.s60
--- a/appfw/uiftestfw/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/uiftestfw/resource/hardware/distribution.policy.s60
--- a/appfw/uiftestfw/resource/hardware/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/uiftestfw/rom/distribution.policy.s60
--- a/appfw/uiftestfw/rom/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/uiftestfw/scripts/emulator/distribution.policy.s60
--- a/appfw/uiftestfw/scripts/emulator/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/uiftestfw/scripts/hardware/distribution.policy.s60
--- a/appfw/uiftestfw/scripts/hardware/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/uiftestfw/src/distribution.policy.s60
--- a/appfw/uiftestfw/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/viewserver/bwins/distribution.policy.s60
--- a/appfw/viewserver/bwins/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/viewserver/client/distribution.policy.s60
--- a/appfw/viewserver/client/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/viewserver/eabi/distribution.policy.s60
--- a/appfw/viewserver/eabi/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/viewserver/group/app-framework_viewsrv.mrp
--- a/appfw/viewserver/group/app-framework_viewsrv.mrp	Tue Feb 02 10:12:00 2010 +0200
+++ b/appfw/viewserver/group/app-framework_viewsrv.mrp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,3 +1,19 @@
+#
+# 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: 
+#
+
 component	app-framework_viewsrv
 source	\sf\mw\appsupport\appfw\viewserver
 binary	\sf\mw\appsupport\appfw\viewserver\group	all
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/viewserver/group/distribution.policy.s60
--- a/appfw/viewserver/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/viewserver/inc/distribution.policy.s60
--- a/appfw/viewserver/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/viewserver/server/distribution.policy.s60
--- a/appfw/viewserver/server/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/viewserver/test/group/distribution.policy.s60
--- a/appfw/viewserver/test/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/viewserver/test/inc/distribution.policy.s60
--- a/appfw/viewserver/test/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/viewserver/test/rom/distribution.policy.s60
--- a/appfw/viewserver/test/rom/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/viewserver/test/scripts/distribution.policy.s60
--- a/appfw/viewserver/test/scripts/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/viewserver/test/scripts/emulator/distribution.policy.s60
--- a/appfw/viewserver/test/scripts/emulator/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/viewserver/test/scripts/hardware/distribution.policy.s60
--- a/appfw/viewserver/test/scripts/hardware/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/viewserver/test/src/distribution.policy.s60
--- a/appfw/viewserver/test/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/viewserver/test/tviews/applaunchtest/group/distribution.policy.s60
--- a/appfw/viewserver/test/tviews/applaunchtest/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/viewserver/test/tviews/applaunchtest/inc/distribution.policy.s60
--- a/appfw/viewserver/test/tviews/applaunchtest/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/viewserver/test/tviews/applaunchtest/src/distribution.policy.s60
--- a/appfw/viewserver/test/tviews/applaunchtest/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/viewserver/test/tviews/tview1/distribution.policy.s60
--- a/appfw/viewserver/test/tviews/tview1/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/viewserver/test/tviews/tview2/distribution.policy.s60
--- a/appfw/viewserver/test/tviews/tview2/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/viewserver/test/tviews/tview3/distribution.policy.s60
--- a/appfw/viewserver/test/tviews/tview3/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/viewserver/test/tviews/tview4/distribution.policy.s60
--- a/appfw/viewserver/test/tviews/tview4/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appfw/viewserver/test/tviews/tvw/distribution.policy.s60
--- a/appfw/viewserver/test/tviews/tvw/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 applaunchservices/aftermarketappstarter/amastartsrc/distribution.policy.s60
--- a/applaunchservices/aftermarketappstarter/amastartsrc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 applaunchservices/aftermarketappstarter/bwins/distribution.policy.s60
--- a/applaunchservices/aftermarketappstarter/bwins/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 applaunchservices/aftermarketappstarter/dscstoresrc/distribution.policy.s60
--- a/applaunchservices/aftermarketappstarter/dscstoresrc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 applaunchservices/aftermarketappstarter/eabi/distribution.policy.s60
--- a/applaunchservices/aftermarketappstarter/eabi/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp
--- a/applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp	Tue Feb 02 10:12:00 2010 +0200
+++ b/applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,3 +1,19 @@
+#
+# 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: 
+#
+
 component	app-framework_amastart
 source	\sf\mw\appsupport\applaunchservices\aftermarketappstarter
 binary	\sf\mw\appsupport\applaunchservices\aftermarketappstarter\group	all
diff -r 2e3d3ce01487 -r c4cbaa4fb734 applaunchservices/aftermarketappstarter/group/distribution.policy.s60
--- a/applaunchservices/aftermarketappstarter/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 applaunchservices/aftermarketappstarter/inc/distribution.policy.s60
--- a/applaunchservices/aftermarketappstarter/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 applaunchservices/aftermarketappstarter/localinc/distribution.policy.s60
--- a/applaunchservices/aftermarketappstarter/localinc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 applaunchservices/aftermarketappstarter/localsrc/distribution.policy.s60
--- a/applaunchservices/aftermarketappstarter/localsrc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 applaunchservices/aftermarketappstarter/test/tamastarter/group/distribution.policy.s60
--- a/applaunchservices/aftermarketappstarter/test/tamastarter/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 applaunchservices/aftermarketappstarter/test/tamastarter/inc/distribution.policy.s60
--- a/applaunchservices/aftermarketappstarter/test/tamastarter/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 applaunchservices/aftermarketappstarter/test/tamastarter/resource/emulator/distribution.policy.s60
--- a/applaunchservices/aftermarketappstarter/test/tamastarter/resource/emulator/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 applaunchservices/aftermarketappstarter/test/tamastarter/resource/hardware/distribution.policy.s60
--- a/applaunchservices/aftermarketappstarter/test/tamastarter/resource/hardware/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 applaunchservices/aftermarketappstarter/test/tamastarter/scripts/distribution.policy.s60
--- a/applaunchservices/aftermarketappstarter/test/tamastarter/scripts/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 applaunchservices/aftermarketappstarter/test/tamastarter/scripts/emulator/distribution.policy.s60
--- a/applaunchservices/aftermarketappstarter/test/tamastarter/scripts/emulator/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 applaunchservices/aftermarketappstarter/test/tamastarter/scripts/hardware/distribution.policy.s60
--- a/applaunchservices/aftermarketappstarter/test/tamastarter/scripts/hardware/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 applaunchservices/aftermarketappstarter/test/tamastarter/src/distribution.policy.s60
--- a/applaunchservices/aftermarketappstarter/test/tamastarter/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 applaunchservices/aftermarketappstarter/test/tdscstore/group/distribution.policy.s60
--- a/applaunchservices/aftermarketappstarter/test/tdscstore/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 applaunchservices/aftermarketappstarter/test/tdscstore/inc/distribution.policy.s60
--- a/applaunchservices/aftermarketappstarter/test/tdscstore/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 applaunchservices/aftermarketappstarter/test/tdscstore/scripts/distribution.policy.s60
--- a/applaunchservices/aftermarketappstarter/test/tdscstore/scripts/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 applaunchservices/aftermarketappstarter/test/tdscstore/src/distribution.policy.s60
--- a/applaunchservices/aftermarketappstarter/test/tdscstore/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 applaunchservices/aftermarketappstarter/test/tdscstore/testdata/distribution.policy.s60
--- a/applaunchservices/aftermarketappstarter/test/tdscstore/testdata/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 applaunchservices/aftermarketappstarter/test/testapps/distribution.policy.s60
--- a/applaunchservices/aftermarketappstarter/test/testapps/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 applaunchservices/applaunchplugins/apstartsrc/distribution.policy.s60
--- a/applaunchservices/applaunchplugins/apstartsrc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 applaunchservices/applaunchplugins/bwins/distribution.policy.s60
--- a/applaunchservices/applaunchplugins/bwins/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 applaunchservices/applaunchplugins/eabi/distribution.policy.s60
--- a/applaunchservices/applaunchplugins/eabi/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 applaunchservices/applaunchplugins/group/app-framework_aplp.mrp
--- a/applaunchservices/applaunchplugins/group/app-framework_aplp.mrp	Tue Feb 02 10:12:00 2010 +0200
+++ b/applaunchservices/applaunchplugins/group/app-framework_aplp.mrp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,3 +1,19 @@
+#
+# 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: 
+#
+
 component	app-framework_aplp
 source	\sf\mw\appsupport\applaunchservices\applaunchplugins
 binary	\sf\mw\appsupport\applaunchservices\applaunchplugins\group	all
diff -r 2e3d3ce01487 -r c4cbaa4fb734 applaunchservices/applaunchplugins/group/distribution.policy.s60
--- a/applaunchservices/applaunchplugins/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 applaunchservices/applaunchplugins/inc/distribution.policy.s60
--- a/applaunchservices/applaunchplugins/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 applaunchservices/applaunchplugins/test/tapstart/group/distribution.policy.s60
--- a/applaunchservices/applaunchplugins/test/tapstart/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 applaunchservices/applaunchplugins/test/tapstart/scripts/distribution.policy.s60
--- a/applaunchservices/applaunchplugins/test/tapstart/scripts/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 applaunchservices/applaunchplugins/test/tapstart/src/distribution.policy.s60
--- a/applaunchservices/applaunchplugins/test/tapstart/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 applaunchservices/applaunchplugins/test/testapps/distribution.policy.s60
--- a/applaunchservices/applaunchplugins/test/testapps/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_info/appsupport_metadata/appsupport_metadata.mrp
--- a/appsupport_info/appsupport_metadata/appsupport_metadata.mrp	Tue Feb 02 10:12:00 2010 +0200
+++ b/appsupport_info/appsupport_metadata/appsupport_metadata.mrp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,3 +1,19 @@
+#
+# 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: 
+#
+
 component           appsupport_metadata
 source   \sf\mw\appsupport\appsupport_info\appsupport_metadata 
 source   \sf\mw\appsupport\package_definition.xml
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_info/appsupport_metadata/distribution.policy.s60
--- a/appsupport_info/appsupport_metadata/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/action_plugin_api/distribution.policy.s60
--- a/appsupport_plat/action_plugin_api/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/action_plugin_api/group/distribution.policy.s60
--- a/appsupport_plat/action_plugin_api/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/action_plugin_api/inc/CFActionPlugin.h
--- a/appsupport_plat/action_plugin_api/inc/CFActionPlugin.h	Tue Feb 02 10:12:00 2010 +0200
+++ b/appsupport_plat/action_plugin_api/inc/CFActionPlugin.h	Fri Apr 16 15:08:06 2010 +0300
@@ -23,7 +23,7 @@
 #include <e32base.h>
 #include <badesca.h>
 
-#include <CFActionPlugInConst.hrh>
+#include <cfactionpluginconst.hrh>
 
 class CCFActionPlugInImpl;
 class CCFActionIndication;
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/action_plugin_api/inc/distribution.policy.s60
--- a/appsupport_plat/action_plugin_api/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/application_orientation_api/distribution.policy.s60
--- a/appsupport_plat/application_orientation_api/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/application_orientation_api/group/distribution.policy.s60
--- a/appsupport_plat/application_orientation_api/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/application_orientation_api/inc/distribution.policy.s60
--- a/appsupport_plat/application_orientation_api/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/context_access_api/distribution.policy.s60
--- a/appsupport_plat/context_access_api/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/context_access_api/group/distribution.policy.s60
--- a/appsupport_plat/context_access_api/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/context_access_api/inc/distribution.policy.s60
--- a/appsupport_plat/context_access_api/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/context_framework_client_api/distribution.policy.s60
--- a/appsupport_plat/context_framework_client_api/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/context_framework_client_api/group/distribution.policy.s60
--- a/appsupport_plat/context_framework_client_api/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/context_framework_client_api/inc/distribution.policy.s60
--- a/appsupport_plat/context_framework_client_api/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/context_framework_listener_api/distribution.policy.s60
--- a/appsupport_plat/context_framework_listener_api/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/context_framework_listener_api/group/distribution.policy.s60
--- a/appsupport_plat/context_framework_listener_api/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/context_framework_listener_api/inc/distribution.policy.s60
--- a/appsupport_plat/context_framework_listener_api/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/context_framework_services_api/distribution.policy.s60
--- a/appsupport_plat/context_framework_services_api/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/context_framework_services_api/group/distribution.policy.s60
--- a/appsupport_plat/context_framework_services_api/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/context_framework_services_api/inc/CFActionIndication.h
--- a/appsupport_plat/context_framework_services_api/inc/CFActionIndication.h	Tue Feb 02 10:12:00 2010 +0200
+++ b/appsupport_plat/context_framework_services_api/inc/CFActionIndication.h	Fri Apr 16 15:08:06 2010 +0300
@@ -20,7 +20,7 @@
 #define C_CFACTIONINDICATION_H
 
 #include <e32base.h>
-#include <CFKeyValuePair.h>
+#include <cfkeyvaluepair.h>
 
 /**
 * Encapsulates inside an action indication. Action indication consists of
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/context_framework_services_api/inc/cfwcontextdef.h
--- a/appsupport_plat/context_framework_services_api/inc/cfwcontextdef.h	Tue Feb 02 10:12:00 2010 +0200
+++ b/appsupport_plat/context_framework_services_api/inc/cfwcontextdef.h	Fri Apr 16 15:08:06 2010 +0300
@@ -20,7 +20,7 @@
 #ifndef CFWCONTEXTDEF_H
 #define CFWCONTEXTDEF_H
 
-#include <CFDefinitions.h>
+#include <cfdefinitions.h>
 
 //-----------------------------------------------------------------------------
 // Source:  'ContextFramework'
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/context_framework_services_api/inc/distribution.policy.s60
--- a/appsupport_plat/context_framework_services_api/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/context_framework_version_api/distribution.policy.s60
--- a/appsupport_plat/context_framework_version_api/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/context_framework_version_api/group/distribution.policy.s60
--- a/appsupport_plat/context_framework_version_api/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/context_framework_version_api/inc/distribution.policy.s60
--- a/appsupport_plat/context_framework_version_api/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/context_source_plugin_api/distribution.policy.s60
--- a/appsupport_plat/context_source_plugin_api/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/context_source_plugin_api/group/distribution.policy.s60
--- a/appsupport_plat/context_source_plugin_api/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/context_source_plugin_api/inc/CFContextSourcePlugIn.h
--- a/appsupport_plat/context_source_plugin_api/inc/CFContextSourcePlugIn.h	Tue Feb 02 10:12:00 2010 +0200
+++ b/appsupport_plat/context_source_plugin_api/inc/CFContextSourcePlugIn.h	Fri Apr 16 15:08:06 2010 +0300
@@ -22,7 +22,7 @@
 
 
 #include <e32base.h>
-#include <CFContextSourcePlugInConst.hrh>
+#include <cfcontextsourcepluginconst.hrh>
 
 class MCFContextInterface;
 class MCFContextSourceSetting;
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/context_source_plugin_api/inc/distribution.policy.s60
--- a/appsupport_plat/context_source_plugin_api/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/context_source_settings_manager_api/distribution.policy.s60
--- a/appsupport_plat/context_source_settings_manager_api/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/context_source_settings_manager_api/group/distribution.policy.s60
--- a/appsupport_plat/context_source_settings_manager_api/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/context_source_settings_manager_api/inc/distribution.policy.s60
--- a/appsupport_plat/context_source_settings_manager_api/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/context_subscription_api/distribution.policy.s60
--- a/appsupport_plat/context_subscription_api/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/context_subscription_api/group/distribution.policy.s60
--- a/appsupport_plat/context_subscription_api/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/context_subscription_api/inc/distribution.policy.s60
--- a/appsupport_plat/context_subscription_api/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/distribution.policy.s60
--- a/appsupport_plat/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/flash_mmi_service_interface_custom_api/Distribution.Policy.S60
--- a/appsupport_plat/flash_mmi_service_interface_custom_api/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/flash_mmi_service_interface_custom_api/group/Distribution.Policy.S60
--- a/appsupport_plat/flash_mmi_service_interface_custom_api/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/flash_mmi_service_interface_custom_api/inc/Distribution.Policy.S60
--- a/appsupport_plat/flash_mmi_service_interface_custom_api/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/flash_netscape_plugin_command_api/Distribution.Policy.S60
--- a/appsupport_plat/flash_netscape_plugin_command_api/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/flash_netscape_plugin_command_api/group/Distribution.Policy.S60
--- a/appsupport_plat/flash_netscape_plugin_command_api/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/flash_netscape_plugin_command_api/inc/Distribution.Policy.S60
--- a/appsupport_plat/flash_netscape_plugin_command_api/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/group/distribution.policy.s60
--- a/appsupport_plat/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/key_event_framework_api/distribution.policy.s60
--- a/appsupport_plat/key_event_framework_api/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/key_event_framework_api/group/distribution.policy.s60
--- a/appsupport_plat/key_event_framework_api/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/key_event_framework_api/inc/distribution.policy.s60
--- a/appsupport_plat/key_event_framework_api/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/key_event_framework_mapper_api/distribution.policy.s60
--- a/appsupport_plat/key_event_framework_mapper_api/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/key_event_framework_mapper_api/group/distribution.policy.s60
--- a/appsupport_plat/key_event_framework_mapper_api/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/key_event_framework_mapper_api/inc/distribution.policy.s60
--- a/appsupport_plat/key_event_framework_mapper_api/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/media_keys_definition_api/distribution.policy.s60
--- a/appsupport_plat/media_keys_definition_api/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/media_keys_definition_api/group/distribution.policy.s60
--- a/appsupport_plat/media_keys_definition_api/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/media_keys_definition_api/inc/distribution.policy.s60
--- a/appsupport_plat/media_keys_definition_api/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/ood_threshold_api/distribution.policy.s60
--- a/appsupport_plat/ood_threshold_api/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/ood_threshold_api/group/distribution.policy.s60
--- a/appsupport_plat/ood_threshold_api/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/ood_threshold_api/inc/distribution.policy.s60
--- a/appsupport_plat/ood_threshold_api/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/oom_monitor_api/distribution.policy.s60
--- a/appsupport_plat/oom_monitor_api/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/oom_monitor_api/group/distribution.policy.s60
--- a/appsupport_plat/oom_monitor_api/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/oom_monitor_api/inc/distribution.policy.s60
--- a/appsupport_plat/oom_monitor_api/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/oom_monitor_plugin_api/distribution.policy.s60
--- a/appsupport_plat/oom_monitor_plugin_api/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/oom_monitor_plugin_api/group/distribution.policy.s60
--- a/appsupport_plat/oom_monitor_plugin_api/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/oom_monitor_plugin_api/inc/distribution.policy.s60
--- a/appsupport_plat/oom_monitor_plugin_api/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/operation_provider_api/distribution.policy.s60
--- a/appsupport_plat/operation_provider_api/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/operation_provider_api/group/distribution.policy.s60
--- a/appsupport_plat/operation_provider_api/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/operation_provider_api/inc/distribution.policy.s60
--- a/appsupport_plat/operation_provider_api/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/phonecmdhandler_api/distribution.policy.s60
--- a/appsupport_plat/phonecmdhandler_api/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/phonecmdhandler_api/group/distribution.policy.s60
--- a/appsupport_plat/phonecmdhandler_api/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/phonecmdhandler_api/inc/distribution.policy.s60
--- a/appsupport_plat/phonecmdhandler_api/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/restore_factory_settings_api/distribution.policy.s60
--- a/appsupport_plat/restore_factory_settings_api/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/restore_factory_settings_api/group/distribution.policy.s60
--- a/appsupport_plat/restore_factory_settings_api/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/restore_factory_settings_api/inc/distribution.policy.s60
--- a/appsupport_plat/restore_factory_settings_api/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/restore_factory_settings_api/inc/rfsClient.h
--- a/appsupport_plat/restore_factory_settings_api/inc/rfsClient.h	Tue Feb 02 10:12:00 2010 +0200
+++ b/appsupport_plat/restore_factory_settings_api/inc/rfsClient.h	Fri Apr 16 15:08:06 2010 +0300
@@ -24,7 +24,7 @@
 
 // INCLUDES
 #include <e32base.h>
-#include "RfsHandler.h"
+#include "rfshandler.h"
 
 // CONSTANTS
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/restore_factory_settings_api/inc/rfsHandler.h
--- a/appsupport_plat/restore_factory_settings_api/inc/rfsHandler.h	Tue Feb 02 10:12:00 2010 +0200
+++ b/appsupport_plat/restore_factory_settings_api/inc/rfsHandler.h	Fri Apr 16 15:08:06 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2002-2010 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"
@@ -41,12 +41,11 @@
 
 // FORWARD DECLARATIONS
 
-class CAknQueryDialog;
-class CAknInformationNote;
 class CEikonEnv;
 class CSecurityHandler;
 class CRfsSecurityHandler;
 class CRfsPdpObserver;
+class CHbDeviceMessageBoxSymbian;
 
 // CLASS DECLARATION
 
@@ -164,7 +163,7 @@
         TInt iFlags;
 
         // confirmation query
-        CAknQueryDialog* iQuery;
+        CHbDeviceMessageBoxSymbian* iQuery;
 
         // for security code query when using SecUI
         CSecurityHandler* iSecurityHandler;
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/restore_factory_settings_plugin_api/distribution.policy.s60
--- a/appsupport_plat/restore_factory_settings_plugin_api/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/restore_factory_settings_plugin_api/group/distribution.policy.s60
--- a/appsupport_plat/restore_factory_settings_plugin_api/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/restore_factory_settings_plugin_api/inc/distribution.policy.s60
--- a/appsupport_plat/restore_factory_settings_plugin_api/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/restore_factory_settings_plugin_api/inc/rfsPlugin.h
--- a/appsupport_plat/restore_factory_settings_plugin_api/inc/rfsPlugin.h	Tue Feb 02 10:12:00 2010 +0200
+++ b/appsupport_plat/restore_factory_settings_plugin_api/inc/rfsPlugin.h	Fri Apr 16 15:08:06 2010 +0300
@@ -22,8 +22,8 @@
 
 //  INCLUDES
 #include <e32base.h>
-#include <ecom/ECom.h>
-#include <rfsPluginDef.h>
+#include <ecom/ecom.h>
+#include <rfsplugindef.h>
 
 // CONSTANTS
 
@@ -89,7 +89,7 @@
     TUid iDtor_ID_Key;
     };
 
-#include "rfsPlugin.inl"
+#include "rfsplugin.inl"
 
 #endif //RFSPLUGIN_H
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/secondary_display_accfw_api/distribution.policy.s60
--- a/appsupport_plat/secondary_display_accfw_api/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/secondary_display_accfw_api/group/distribution.policy.s60
--- a/appsupport_plat/secondary_display_accfw_api/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/secondary_display_accfw_api/inc/distribution.policy.s60
--- a/appsupport_plat/secondary_display_accfw_api/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/secondary_display_accfw_api/inc/secondarydisplay/distribution.policy.s60
--- a/appsupport_plat/secondary_display_accfw_api/inc/secondarydisplay/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/secondary_display_startup_api/distribution.policy.s60
--- a/appsupport_plat/secondary_display_startup_api/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/secondary_display_startup_api/group/distribution.policy.s60
--- a/appsupport_plat/secondary_display_startup_api/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/secondary_display_startup_api/inc/SecondaryDisplay/distribution.policy.s60
--- a/appsupport_plat/secondary_display_startup_api/inc/SecondaryDisplay/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/secondary_display_startup_api/inc/distribution.policy.s60
--- a/appsupport_plat/secondary_display_startup_api/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/secondary_display_sysap_api/distribution.policy.s60
--- a/appsupport_plat/secondary_display_sysap_api/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/secondary_display_sysap_api/group/distribution.policy.s60
--- a/appsupport_plat/secondary_display_sysap_api/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/secondary_display_sysap_api/inc/distribution.policy.s60
--- a/appsupport_plat/secondary_display_sysap_api/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/secondary_display_sysap_api/inc/secondarydisplay/distribution.policy.s60
--- a/appsupport_plat/secondary_display_sysap_api/inc/secondarydisplay/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/secondary_display_system_state_api/distribution.policy.s60
--- a/appsupport_plat/secondary_display_system_state_api/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/secondary_display_system_state_api/group/distribution.policy.s60
--- a/appsupport_plat/secondary_display_system_state_api/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/secondary_display_system_state_api/inc/SecondaryDisplay/distribution.policy.s60
--- a/appsupport_plat/secondary_display_system_state_api/inc/SecondaryDisplay/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/secondary_display_system_state_api/inc/distribution.policy.s60
--- a/appsupport_plat/secondary_display_system_state_api/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/sensor_user_setting_api/distribution.policy.s60
--- a/appsupport_plat/sensor_user_setting_api/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/sensor_user_setting_api/group/distribution.policy.s60
--- a/appsupport_plat/sensor_user_setting_api/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/sensor_user_setting_api/inc/distribution.policy.s60
--- a/appsupport_plat/sensor_user_setting_api/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/startup_configuration_api/distribution.policy.s60
--- a/appsupport_plat/startup_configuration_api/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/startup_configuration_api/group/distribution.policy.s60
--- a/appsupport_plat/startup_configuration_api/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/startup_configuration_api/inc/distribution.policy.s60
--- a/appsupport_plat/startup_configuration_api/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/system_application_key_handler_plugin_api/distribution.policy.s60
--- a/appsupport_plat/system_application_key_handler_plugin_api/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/system_application_key_handler_plugin_api/group/distribution.policy.s60
--- a/appsupport_plat/system_application_key_handler_plugin_api/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/system_application_key_handler_plugin_api/inc/distribution.policy.s60
--- a/appsupport_plat/system_application_key_handler_plugin_api/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/system_application_key_handler_plugin_api/inc/sysapkeyhandlerplugininterface.h
--- a/appsupport_plat/system_application_key_handler_plugin_api/inc/sysapkeyhandlerplugininterface.h	Tue Feb 02 10:12:00 2010 +0200
+++ b/appsupport_plat/system_application_key_handler_plugin_api/inc/sysapkeyhandlerplugininterface.h	Fri Apr 16 15:08:06 2010 +0300
@@ -23,8 +23,8 @@
 // INCLUDES
 #include <ecom/ecom.h>
 #include <e32base.h>
-#include <COEDEF.H>
-#include <W32STD.H>
+#include <coedef.h>
+#include <w32std.h>
 #include <sysapcallback.h>
 
 //CONSTANTS
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/system_application_light_control_plugin_api/distribution.policy.s60
--- a/appsupport_plat/system_application_light_control_plugin_api/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/system_application_light_control_plugin_api/group/distribution.policy.s60
--- a/appsupport_plat/system_application_light_control_plugin_api/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/system_application_light_control_plugin_api/inc/distribution.policy.s60
--- a/appsupport_plat/system_application_light_control_plugin_api/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/system_application_notification_api/distribution.policy.s60
--- a/appsupport_plat/system_application_notification_api/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/system_application_notification_api/group/distribution.policy.s60
--- a/appsupport_plat/system_application_notification_api/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/system_application_notification_api/inc/distribution.policy.s60
--- a/appsupport_plat/system_application_notification_api/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/system_application_plugin_callback_api/distribution.policy.s60
--- a/appsupport_plat/system_application_plugin_callback_api/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/system_application_plugin_callback_api/group/distribution.policy.s60
--- a/appsupport_plat/system_application_plugin_callback_api/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_plat/system_application_plugin_callback_api/inc/distribution.policy.s60
--- a/appsupport_plat/system_application_plugin_callback_api/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_pub/distribution.policy.s60
--- a/appsupport_pub/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_pub/flash_viewer_framework_api/Distribution.Policy.S60
--- a/appsupport_pub/flash_viewer_framework_api/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_pub/flash_viewer_framework_api/group/Distribution.Policy.S60
--- a/appsupport_pub/flash_viewer_framework_api/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_pub/flash_viewer_framework_api/inc/Distribution.Policy.S60
--- a/appsupport_pub/flash_viewer_framework_api/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_pub/flash_viewer_framework_api/tsrc/Distribution.Policy.S60
--- a/appsupport_pub/flash_viewer_framework_api/tsrc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_pub/flash_viewer_framework_api/tsrc/bc/Distribution.Policy.S60
--- a/appsupport_pub/flash_viewer_framework_api/tsrc/bc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_pub/flash_viewer_framework_api/tsrc/bc/flashviewerframework/Distribution.Policy.S60
--- a/appsupport_pub/flash_viewer_framework_api/tsrc/bc/flashviewerframework/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_pub/flash_viewer_framework_api/tsrc/bc/flashviewerframework/data/Distribution.Policy.S60
--- a/appsupport_pub/flash_viewer_framework_api/tsrc/bc/flashviewerframework/data/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_pub/flash_viewer_framework_api/tsrc/bc/flashviewerframework/group/Distribution.Policy.S60
--- a/appsupport_pub/flash_viewer_framework_api/tsrc/bc/flashviewerframework/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_pub/flash_viewer_framework_api/tsrc/bc/flashviewerframework/inc/Distribution.Policy.S60
--- a/appsupport_pub/flash_viewer_framework_api/tsrc/bc/flashviewerframework/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_pub/flash_viewer_framework_api/tsrc/bc/flashviewerframework/rom_files/Distribution.Policy.S60
--- a/appsupport_pub/flash_viewer_framework_api/tsrc/bc/flashviewerframework/rom_files/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_pub/flash_viewer_framework_api/tsrc/bc/flashviewerframework/sis/Distribution.Policy.S60
--- a/appsupport_pub/flash_viewer_framework_api/tsrc/bc/flashviewerframework/sis/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_pub/flash_viewer_framework_api/tsrc/bc/flashviewerframework/src/Distribution.Policy.S60
--- a/appsupport_pub/flash_viewer_framework_api/tsrc/bc/flashviewerframework/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_pub/group/distribution.policy.s60
--- a/appsupport_pub/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_pub/network_status_api/distribution.policy.s60
--- a/appsupport_pub/network_status_api/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_pub/network_status_api/group/distribution.policy.s60
--- a/appsupport_pub/network_status_api/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_pub/network_status_api/inc/distribution.policy.s60
--- a/appsupport_pub/network_status_api/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_pub/network_status_api/tsrc/bc/distribution.policy.s60
--- a/appsupport_pub/network_status_api/tsrc/bc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_pub/network_status_api/tsrc/bc/networkstatus/Bmarm/distribution.policy.s60
--- a/appsupport_pub/network_status_api/tsrc/bc/networkstatus/Bmarm/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_pub/network_status_api/tsrc/bc/networkstatus/Bwins/distribution.policy.s60
--- a/appsupport_pub/network_status_api/tsrc/bc/networkstatus/Bwins/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_pub/network_status_api/tsrc/bc/networkstatus/EABI/distribution.policy.s60
--- a/appsupport_pub/network_status_api/tsrc/bc/networkstatus/EABI/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_pub/network_status_api/tsrc/bc/networkstatus/distribution.policy.s60
--- a/appsupport_pub/network_status_api/tsrc/bc/networkstatus/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_pub/network_status_api/tsrc/bc/networkstatus/group/distribution.policy.s60
--- a/appsupport_pub/network_status_api/tsrc/bc/networkstatus/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_pub/network_status_api/tsrc/bc/networkstatus/inc/distribution.policy.s60
--- a/appsupport_pub/network_status_api/tsrc/bc/networkstatus/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_pub/network_status_api/tsrc/bc/networkstatus/init/distribution.policy.s60
--- a/appsupport_pub/network_status_api/tsrc/bc/networkstatus/init/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_pub/network_status_api/tsrc/bc/networkstatus/src/distribution.policy.s60
--- a/appsupport_pub/network_status_api/tsrc/bc/networkstatus/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 appsupport_pub/network_status_api/tsrc/distribution.policy.s60
--- a/appsupport_pub/network_status_api/tsrc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/AlarmAlert/Include/distribution.policy.s60
--- a/commonappservices/alarmserver/AlarmAlert/Include/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/AlarmAlert/Shared/distribution.policy.s60
--- a/commonappservices/alarmserver/AlarmAlert/Shared/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/AlarmAlert/Source/distribution.policy.s60
--- a/commonappservices/alarmserver/AlarmAlert/Source/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/Client/Include/distribution.policy.s60
--- a/commonappservices/alarmserver/Client/Include/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/Client/Source/distribution.policy.s60
--- a/commonappservices/alarmserver/Client/Source/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/ConsoleAlarmAlertServer/Include/distribution.policy.s60
--- a/commonappservices/alarmserver/ConsoleAlarmAlertServer/Include/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/ConsoleAlarmAlertServer/Source/ConsoleAlarmAlertSession.cpp
--- a/commonappservices/alarmserver/ConsoleAlarmAlertServer/Source/ConsoleAlarmAlertSession.cpp	Tue Feb 02 10:12:00 2010 +0200
+++ b/commonappservices/alarmserver/ConsoleAlarmAlertServer/Source/ConsoleAlarmAlertSession.cpp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-2010 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"
@@ -16,7 +16,7 @@
 #include "ConsoleAlarmAlertSession.h"
 #include <e32svr.h>
 #include <asaltdefs.h>
-#include <test/consoleantestclient.h>
+#include "test/consoleantestclient.h"
 #include "ConsoleAlarmAlertSession.h"
 #include "ConsoleAlarmAlertConsole.h"
 #include "ConsoleAlarmAlertLEDFlasher.h"
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/ConsoleAlarmAlertServer/Source/distribution.policy.s60
--- a/commonappservices/alarmserver/ConsoleAlarmAlertServer/Source/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/ConsoleAlarmAlertServer/app-services_consolealarmalertserver.mrp
--- a/commonappservices/alarmserver/ConsoleAlarmAlertServer/app-services_consolealarmalertserver.mrp	Tue Feb 02 10:12:00 2010 +0200
+++ b/commonappservices/alarmserver/ConsoleAlarmAlertServer/app-services_consolealarmalertserver.mrp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,3 +1,19 @@
+#
+# 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: 
+#
+
 component	app-services_consolealarmalertserver
 
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/ConsoleAlarmAlertServer/distribution.policy.s60
--- a/commonappservices/alarmserver/ConsoleAlarmAlertServer/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/Design/EALWL to Alarm Server Porting Guide.doc
Binary file commonappservices/alarmserver/Design/EALWL to Alarm Server Porting Guide.doc has changed
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/Design/distribution.policy.s60
--- a/commonappservices/alarmserver/Design/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/Documentation/SGL.GT0257.207_Rev1.1_Alarm_Server_Configuration_how_to.doc
Binary file commonappservices/alarmserver/Documentation/SGL.GT0257.207_Rev1.1_Alarm_Server_Configuration_how_to.doc has changed
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/Documentation/alarm server test code.doc
Binary file commonappservices/alarmserver/Documentation/alarm server test code.doc has changed
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/Documentation/distribution.policy.s60
--- a/commonappservices/alarmserver/Documentation/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/Group/app-services_alarmserver.mrp
--- a/commonappservices/alarmserver/Group/app-services_alarmserver.mrp	Tue Feb 02 10:12:00 2010 +0200
+++ b/commonappservices/alarmserver/Group/app-services_alarmserver.mrp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,3 +1,19 @@
+#
+# 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: 
+#
+
 component	app-services_alarmserver
 source	\sf\mw\appsupport\commonappservices\alarmserver
 binary	\sf\mw\appsupport\commonappservices\alarmserver\Group	all
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/Group/backup_registration.xml
--- a/commonappservices/alarmserver/Group/backup_registration.xml	Tue Feb 02 10:12:00 2010 +0200
+++ b/commonappservices/alarmserver/Group/backup_registration.xml	Fri Apr 16 15:08:06 2010 +0300
@@ -1,10 +1,10 @@
 <?xml version="1.0" standalone="yes"?>
 
 <!--
- Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+ Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
  All rights reserved.
  This component and the accompanying materials are made available
- under the terms of the License "Eclipse Public License v1.0"
+ 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".
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/Group/distribution.policy.s60
--- a/commonappservices/alarmserver/Group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/Server/Include/distribution.policy.s60
--- a/commonappservices/alarmserver/Server/Include/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/Server/Source/distribution.policy.s60
--- a/commonappservices/alarmserver/Server/Source/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/Shared/Include/distribution.policy.s60
--- a/commonappservices/alarmserver/Shared/Include/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/Shared/Source/distribution.policy.s60
--- a/commonappservices/alarmserver/Shared/Source/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/Test/Integration/AlarmTestServer/data/distribution.policy.s60
--- a/commonappservices/alarmserver/Test/Integration/AlarmTestServer/data/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/Test/Integration/AlarmTestServer/documentation/SGL.GT0257.603_AlarmServer updatesTest Specification.doc
Binary file commonappservices/alarmserver/Test/Integration/AlarmTestServer/documentation/SGL.GT0257.603_AlarmServer updatesTest Specification.doc has changed
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/Test/Integration/AlarmTestServer/documentation/distribution.policy.s60
--- a/commonappservices/alarmserver/Test/Integration/AlarmTestServer/documentation/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/Test/Integration/AlarmTestServer/group/distribution.policy.s60
--- a/commonappservices/alarmserver/Test/Integration/AlarmTestServer/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/Test/Integration/AlarmTestServer/inc/distribution.policy.s60
--- a/commonappservices/alarmserver/Test/Integration/AlarmTestServer/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/Test/Integration/AlarmTestServer/scripts/distribution.policy.s60
--- a/commonappservices/alarmserver/Test/Integration/AlarmTestServer/scripts/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/Test/Integration/AlarmTestServer/src/distribution.policy.s60
--- a/commonappservices/alarmserver/Test/Integration/AlarmTestServer/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/Test/Integration/TestCITAlarmServer/Documentation/SGL.GT0257.612.Bravo_SystemSupportForUTC_Test_Case_PREQ234 Rev1.0.doc
Binary file commonappservices/alarmserver/Test/Integration/TestCITAlarmServer/Documentation/SGL.GT0257.612.Bravo_SystemSupportForUTC_Test_Case_PREQ234 Rev1.0.doc has changed
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/Test/Integration/TestCITAlarmServer/Documentation/distribution.policy.s60
--- a/commonappservices/alarmserver/Test/Integration/TestCITAlarmServer/Documentation/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/Test/Integration/TestCITAlarmServer/group/distribution.policy.s60
--- a/commonappservices/alarmserver/Test/Integration/TestCITAlarmServer/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/Test/Integration/TestCITAlarmServer/scripts/distribution.policy.s60
--- a/commonappservices/alarmserver/Test/Integration/TestCITAlarmServer/scripts/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/Test/Integration/TestCITAlarmServer/src/distribution.policy.s60
--- a/commonappservices/alarmserver/Test/Integration/TestCITAlarmServer/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/Test/Integration/TestCITAlarmServer/testdata/distribution.policy.s60
--- a/commonappservices/alarmserver/Test/Integration/TestCITAlarmServer/testdata/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/Test/distribution.policy.s60
--- a/commonappservices/alarmserver/Test/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/Test/group/consolealarmalertserver.mmp
--- a/commonappservices/alarmserver/Test/group/consolealarmalertserver.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/commonappservices/alarmserver/Test/group/consolealarmalertserver.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-2010 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"
@@ -30,7 +30,7 @@
 USERINCLUDE				../../ConsoleAlarmAlertServer/Include
 USERINCLUDE				../../AlarmAlert/Shared
 USERINCLUDE				../../Shared/Include
-USERINCLUDE				..
+USERINCLUDE				../..
 
 MW_LAYER_SYSTEMINCLUDE_SYMBIAN
 APP_LAYER_SYSTEMINCLUDE_SYMBIAN
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/Test/group/distribution.policy.s60
--- a/commonappservices/alarmserver/Test/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/Test/ssm/distribution.policy.s60
--- a/commonappservices/alarmserver/Test/ssm/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/Test/unit/group/distribution.policy.s60
--- a/commonappservices/alarmserver/Test/unit/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/Test/unit/inc/distribution.policy.s60
--- a/commonappservices/alarmserver/Test/unit/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/Test/unit/scripts/distribution.policy.s60
--- a/commonappservices/alarmserver/Test/unit/scripts/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/Test/unit/src/distribution.policy.s60
--- a/commonappservices/alarmserver/Test/unit/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/bwins/distribution.policy.s60
--- a/commonappservices/alarmserver/bwins/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmserver/eabi/distribution.policy.s60
--- a/commonappservices/alarmserver/eabi/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmservertest/TestAlarmSrv/AlarmCreateDelete/distribution.policy.s60
--- a/commonappservices/alarmservertest/TestAlarmSrv/AlarmCreateDelete/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp
--- a/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp	Tue Feb 02 10:12:00 2010 +0200
+++ b/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,3 +1,19 @@
+#
+# 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: 
+#
+
 component	app-services_testalarmsrv
 source	\sf\mw\appsupport\commonappservices\alarmservertest
 binary	\sf\mw\appsupport\commonappservices\alarmservertest\TestAlarmSrv	all
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmservertest/TestAlarmSrv/distribution.policy.s60
--- a/commonappservices/alarmservertest/TestAlarmSrv/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmservertest/TestAlarmSrv/startconsolealarmalertserver/distribution.policy.s60
--- a/commonappservices/alarmservertest/TestAlarmSrv/startconsolealarmalertserver/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmservertest/TestMultipleAlarmsSuite/group/distribution.policy.s60
--- a/commonappservices/alarmservertest/TestMultipleAlarmsSuite/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmservertest/TestMultipleAlarmsSuite/inc/distribution.policy.s60
--- a/commonappservices/alarmservertest/TestMultipleAlarmsSuite/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmservertest/TestMultipleAlarmsSuite/scripts/distribution.policy.s60
--- a/commonappservices/alarmservertest/TestMultipleAlarmsSuite/scripts/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmservertest/TestMultipleAlarmsSuite/src/distribution.policy.s60
--- a/commonappservices/alarmservertest/TestMultipleAlarmsSuite/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/alarmservertest/TestMultipleAlarmsSuite/testdata/distribution.policy.s60
--- a/commonappservices/alarmservertest/TestMultipleAlarmsSuite/testdata/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/appservicesdocs/App-Services_Architectural_Description.doc
Binary file commonappservices/appservicesdocs/App-Services_Architectural_Description.doc has changed
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/appservicesdocs/App-Services_Functional_Specification.doc
Binary file commonappservices/appservicesdocs/App-Services_Functional_Specification.doc has changed
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/appservicesdocs/PIMTestCodeOrganisationHowTo.doc
Binary file commonappservices/appservicesdocs/PIMTestCodeOrganisationHowTo.doc has changed
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/appservicesdocs/SGL.GT0109.110_Rev1.2_AppServices_Subsystem_Release_Note.doc
Binary file commonappservices/appservicesdocs/SGL.GT0109.110_Rev1.2_AppServices_Subsystem_Release_Note.doc has changed
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/appservicesdocs/SGL.GT228.017_Migration Guide for v9.1 Time Handling APIs.doc
Binary file commonappservices/appservicesdocs/SGL.GT228.017_Migration Guide for v9.1 Time Handling APIs.doc has changed
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/appservicesdocs/app-services_documentation.mrp
--- a/commonappservices/appservicesdocs/app-services_documentation.mrp	Tue Feb 02 10:12:00 2010 +0200
+++ b/commonappservices/appservicesdocs/app-services_documentation.mrp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,3 +1,19 @@
+#
+# 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: 
+#
+
 component	app-services_documentation
 
 source	\sf\mw\appsupport\commonappservices\appservicesdocs\
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/appservicesdocs/distribution.policy.s60
--- a/commonappservices/appservicesdocs/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/backuprestorenotification/bwins/distribution.policy.s60
--- a/commonappservices/backuprestorenotification/bwins/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/backuprestorenotification/eabi/distribution.policy.s60
--- a/commonappservices/backuprestorenotification/eabi/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp
--- a/commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp	Tue Feb 02 10:12:00 2010 +0200
+++ b/commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,3 +1,19 @@
+#
+# 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: 
+#
+
 component	app-services_BackupRestoreNotification
 source	\sf\mw\appsupport\commonappservices\backuprestorenotification
 binary	\sf\mw\appsupport\commonappservices\backuprestorenotification\group	all
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/backuprestorenotification/group/distribution.policy.s60
--- a/commonappservices/backuprestorenotification/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/backuprestorenotification/inc/distribution.policy.s60
--- a/commonappservices/backuprestorenotification/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/backuprestorenotification/src/distribution.policy.s60
--- a/commonappservices/backuprestorenotification/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/backuprestorenotification/tsrc/Integration/TestBackupRestoreNotification/group/distribution.policy.s60
--- a/commonappservices/backuprestorenotification/tsrc/Integration/TestBackupRestoreNotification/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/backuprestorenotification/tsrc/Integration/TestBackupRestoreNotification/inc/distribution.policy.s60
--- a/commonappservices/backuprestorenotification/tsrc/Integration/TestBackupRestoreNotification/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/backuprestorenotification/tsrc/Integration/TestBackupRestoreNotification/scripts/distribution.policy.s60
--- a/commonappservices/backuprestorenotification/tsrc/Integration/TestBackupRestoreNotification/scripts/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/backuprestorenotification/tsrc/Integration/TestBackupRestoreNotification/src/distribution.policy.s60
--- a/commonappservices/backuprestorenotification/tsrc/Integration/TestBackupRestoreNotification/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/coreappstest/Group/app-services_CoreAppsTest.mrp
--- a/commonappservices/coreappstest/Group/app-services_CoreAppsTest.mrp	Tue Feb 02 10:12:00 2010 +0200
+++ b/commonappservices/coreappstest/Group/app-services_CoreAppsTest.mrp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,3 +1,19 @@
+#
+# 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: 
+#
+
 component app-services_coreappstest
 source	\sf\mw\appsupport\commonappservices\coreappstest
 binary	\sf\mw\appsupport\commonappservices\coreappstest\Group	all
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/coreappstest/Group/distribution.policy.s60
--- a/commonappservices/coreappstest/Group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/coreappstest/Inc/distribution.policy.s60
--- a/commonappservices/coreappstest/Inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/coreappstest/TestServer/Client/distribution.policy.s60
--- a/commonappservices/coreappstest/TestServer/Client/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/coreappstest/TestServer/Inc/distribution.policy.s60
--- a/commonappservices/coreappstest/TestServer/Inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/coreappstest/TestServer/Server/distribution.policy.s60
--- a/commonappservices/coreappstest/TestServer/Server/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/coreappstest/TestServer/Test/distribution.policy.s60
--- a/commonappservices/coreappstest/TestServer/Test/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/coreappstest/bwins/distribution.policy.s60
--- a/commonappservices/coreappstest/bwins/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/coreappstest/eabi/distribution.policy.s60
--- a/commonappservices/coreappstest/eabi/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 commonappservices/coreappstest/preparedrivec/distribution.policy.s60
--- a/commonappservices/coreappstest/preparedrivec/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contenthandling/webrecognisers/Documentation/Recogniser Test Specifications.doc
Binary file contenthandling/webrecognisers/Documentation/Recogniser Test Specifications.doc has changed
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contenthandling/webrecognisers/Documentation/distribution.policy.s60
--- a/contenthandling/webrecognisers/Documentation/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contenthandling/webrecognisers/Test/Group/distribution.policy.s60
--- a/contenthandling/webrecognisers/Test/Group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contenthandling/webrecognisers/Test/t_ebookmark/TestData/distribution.policy.s60
--- a/contenthandling/webrecognisers/Test/t_ebookmark/TestData/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contenthandling/webrecognisers/Test/t_ebookmark/distribution.policy.s60
--- a/contenthandling/webrecognisers/Test/t_ebookmark/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contenthandling/webrecognisers/Test/t_recogtest/distribution.policy.s60
--- a/contenthandling/webrecognisers/Test/t_recogtest/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contenthandling/webrecognisers/Test/t_recwap/TestData/distribution.policy.s60
--- a/contenthandling/webrecognisers/Test/t_recwap/TestData/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contenthandling/webrecognisers/Test/t_recwap/distribution.policy.s60
--- a/contenthandling/webrecognisers/Test/t_recwap/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contenthandling/webrecognisers/Test/t_recweb/TestData/distribution.policy.s60
--- a/contenthandling/webrecognisers/Test/t_recweb/TestData/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contenthandling/webrecognisers/Test/t_recweb/distribution.policy.s60
--- a/contenthandling/webrecognisers/Test/t_recweb/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contenthandling/webrecognisers/Test/t_weburlrec/distribution.policy.s60
--- a/contenthandling/webrecognisers/Test/t_weburlrec/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contenthandling/webrecognisers/bwins/distribution.policy.s60
--- a/contenthandling/webrecognisers/bwins/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contenthandling/webrecognisers/eBookmark/distribution.policy.s60
--- a/contenthandling/webrecognisers/eBookmark/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contenthandling/webrecognisers/eBookmark/ebookmark.doc
Binary file contenthandling/webrecognisers/eBookmark/ebookmark.doc has changed
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contenthandling/webrecognisers/eBookmark/examples/distribution.policy.s60
--- a/contenthandling/webrecognisers/eBookmark/examples/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contenthandling/webrecognisers/eabi/distribution.policy.s60
--- a/contenthandling/webrecognisers/eabi/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contenthandling/webrecognisers/group/BLD.INF
--- a/contenthandling/webrecognisers/group/BLD.INF	Tue Feb 02 10:12:00 2010 +0200
+++ b/contenthandling/webrecognisers/group/BLD.INF	Fri Apr 16 15:08:06 2010 +0300
@@ -24,8 +24,6 @@
 // If there's no destination then the source file will be copied
 // to the same name in /epoc32/include
 
-../eBookmark/ebookmark.doc /epoc32/engdoc/ebookmark/ebookmark.doc
-
 ../group/recognisers.iby /epoc32/rom/include/recognisers.iby
 
 ../waprecogniser/wapmime.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(wapmime.h)
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contenthandling/webrecognisers/group/application-protocols_recognisers.mrp
--- a/contenthandling/webrecognisers/group/application-protocols_recognisers.mrp	Tue Feb 02 10:12:00 2010 +0200
+++ b/contenthandling/webrecognisers/group/application-protocols_recognisers.mrp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,8 +1,23 @@
+#
+# 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: 
+#
+
 component	application-protocols_recognisers
 source	\sf\mw\appsupport\contenthandling\webrecognisers
 binary	\sf\mw\appsupport\contenthandling\webrecognisers\group	all
 exports	\sf\mw\appsupport\contenthandling\webrecognisers\group
--export_file	\sf\mw\appsupport\contenthandling\webrecognisers\eBookmark\ebookmark.doc	\epoc32\engdoc\ebookmark\eBookmark.doc
 notes_source	\component_defs\release.src
 
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contenthandling/webrecognisers/group/distribution.policy.s60
--- a/contenthandling/webrecognisers/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contenthandling/webrecognisers/recweb/distribution.policy.s60
--- a/contenthandling/webrecognisers/recweb/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contenthandling/webrecognisers/waprecogniser/distribution.policy.s60
--- a/contenthandling/webrecognisers/waprecogniser/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contenthandling/webrecognisers/weburlrec/distribution.policy.s60
--- a/contenthandling/webrecognisers/weburlrec/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/Distribution.Policy.S60
--- a/contextframework/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/BWINS/Distribution.Policy.S60
--- a/contextframework/cfw/BWINS/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/CenRep/Distribution.Policy.S60
--- a/contextframework/cfw/CenRep/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/Distribution.Policy.S60
--- a/contextframework/cfw/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/EABI/Distribution.Policy.S60
--- a/contextframework/cfw/EABI/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/conf/Distribution.Policy.S60
--- a/contextframework/cfw/conf/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/data/Distribution.Policy.S60
--- a/contextframework/cfw/data/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/group/Distribution.Policy.S60
--- a/contextframework/cfw/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/group/bld.inf
--- a/contextframework/cfw/group/bld.inf	Tue Feb 02 10:12:00 2010 +0200
+++ b/contextframework/cfw/group/bld.inf	Fri Apr 16 15:08:06 2010 +0300
@@ -32,9 +32,9 @@
 ../conf/contextframework_10282BCE.crml 	    MW_LAYER_CRML(contextframework_10282BCE.crml)
 ../conf/contextframework_200159ED.crml 	    MW_LAYER_CRML(contextframework_200159ED.crml)
 
-../data/backup_registration.xml /epoc32/data/Z/private/10282BC4/backup_registration.xml
-../data/backup_registration.xml /epoc32/release/winscw/UDEB/Z/private/10282BC4/backup_registration.xml
-../data/backup_registration.xml /epoc32/release/winscw/UREL/Z/private/10282BC4/backup_registration.xml
+../data/backup_registration.xml /epoc32/data/z/private/10282bc4/backup_registration.xml
+../data/backup_registration.xml /epoc32/release/winscw/udeb/z/private/10282bc4/backup_registration.xml
+../data/backup_registration.xml /epoc32/release/winscw/urel/z/private/10282bc4/backup_registration.xml
 
 #ifdef RD_CONTEXT_FRAMEWORK
 ../rom/ContextFramework.iby CORE_MW_LAYER_IBY_EXPORT_PATH(ContextFramework.iby)
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/group/cfactivatorengine.mmp
--- a/contextframework/cfw/group/cfactivatorengine.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/contextframework/cfw/group/cfactivatorengine.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -19,7 +19,7 @@
 #include <platform_paths.hrh>
 #include "../inc/common/cftraceconfiguration.hrh"
 
-TARGET        			CFActivatorEngine.dll
+TARGET        			cfactivatorengine.dll
 TARGETTYPE    			dll
 UID           			0x1000008d 0x10282BC6
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/group/cfclient.mmp
--- a/contextframework/cfw/group/cfclient.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/contextframework/cfw/group/cfclient.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -19,7 +19,7 @@
 #include <platform_paths.hrh>
 #include "../inc/common/cftraceconfiguration.hrh"
 
-TARGET          		CFClient.dll
+TARGET          		cfclient.dll
 TARGETTYPE      		dll
 UID             		0x1000008d 0x10282BC3
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/group/cfcontextsourcemanager.mmp
--- a/contextframework/cfw/group/cfcontextsourcemanager.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/contextframework/cfw/group/cfcontextsourcemanager.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -19,7 +19,7 @@
 #include <platform_paths.hrh>
 #include "../inc/common/cftraceconfiguration.hrh"
 
-TARGET                  CFContextSourceManager.dll
+TARGET                  cfcontextsourcemanager.dll
 TARGETTYPE              dll
 UID                     0x1000008d 0x10282BCB
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/group/cfcontextsourcesettingsmanager.mmp
--- a/contextframework/cfw/group/cfcontextsourcesettingsmanager.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/contextframework/cfw/group/cfcontextsourcesettingsmanager.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -19,7 +19,7 @@
 #include <platform_paths.hrh>
 #include "../inc/common/cftraceconfiguration.hrh"
 
-TARGET          	CFContextSourceSettingsManager.dll
+TARGET          	cfcontextsourcesettingsmanager.dll
 TARGETTYPE      	dll
 UID             	0x1000008d 0x10282ED9
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/group/cfscriptengine.mmp
--- a/contextframework/cfw/group/cfscriptengine.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/contextframework/cfw/group/cfscriptengine.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -19,7 +19,7 @@
 #include <platform_paths.hrh>
 #include "../inc/common/cftraceconfiguration.hrh"
 
-TARGET          		CFScriptEngine.dll
+TARGET          		cfscriptengine.dll
 TARGETTYPE      		dll
 UID             		0x1000008d 0x10282BC7
 EPOCSTACKSIZE   		20480
@@ -54,7 +54,7 @@
 LIBRARY         		cfservices.lib
 LIBRARY         		cfoperationpluginservices.lib
 LIBRARY         		ecom.lib
-LIBRARY				PlatformEnv.lib
+LIBRARY				platformenv.lib
 #ifdef TRACE_INTO_FILE
 LIBRARY         		flogger.lib
 #endif
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/group/cfserver.mmp
--- a/contextframework/cfw/group/cfserver.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/contextframework/cfw/group/cfserver.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -19,7 +19,7 @@
 #include <platform_paths.hrh>
 #include "../inc/common/cftraceconfiguration.hrh"
 
-TARGET		  	CFServer.exe
+TARGET		  	cfserver.exe
 TARGETTYPE	    	exe
 UID			0 0x10282BC4
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/group/cfservices.mmp
--- a/contextframework/cfw/group/cfservices.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/contextframework/cfw/group/cfservices.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -19,7 +19,7 @@
 #include <platform_paths.hrh>
 #include "../inc/common/cftraceconfiguration.hrh"
 
-TARGET          		CFServices.dll
+TARGET          		cfservices.dll
 TARGETTYPE      		dll
 UID             		0x1000008d 0x10282BC5
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/inc/Distribution.Policy.S60
--- a/contextframework/cfw/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/inc/basicoperationsplugin/Distribution.Policy.S60
--- a/contextframework/cfw/inc/basicoperationsplugin/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/inc/cfactivatorengine/Distribution.Policy.S60
--- a/contextframework/cfw/inc/cfactivatorengine/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/inc/cfclient/Distribution.Policy.S60
--- a/contextframework/cfw/inc/cfclient/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/inc/cfcontextsourcemanager/Distribution.Policy.S60
--- a/contextframework/cfw/inc/cfcontextsourcemanager/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/inc/cfcontextsourcesettingsmanager/cfcontextsourcesettingsmanagerimpl.h
--- a/contextframework/cfw/inc/cfcontextsourcesettingsmanager/cfcontextsourcesettingsmanagerimpl.h	Tue Feb 02 10:12:00 2010 +0200
+++ b/contextframework/cfw/inc/cfcontextsourcesettingsmanager/cfcontextsourcesettingsmanagerimpl.h	Fri Apr 16 15:08:06 2010 +0300
@@ -23,7 +23,7 @@
 
 #include "cfcontextsourcesettingsmanager.h"
 
-#include <GMXMLParser.h>
+#include <gmxmlparser.h>
 
 class RFs;
 class CMDXMLNode;
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/inc/cfcontextsourcesettingsmanager/distribution.policy.s60
--- a/contextframework/cfw/inc/cfcontextsourcesettingsmanager/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/inc/cfoperationpluginservices/Distribution.Policy.S60
--- a/contextframework/cfw/inc/cfoperationpluginservices/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/inc/cfscriptengine/CFScriptHandler.h
--- a/contextframework/cfw/inc/cfscriptengine/CFScriptHandler.h	Tue Feb 02 10:12:00 2010 +0200
+++ b/contextframework/cfw/inc/cfscriptengine/CFScriptHandler.h	Fri Apr 16 15:08:06 2010 +0300
@@ -21,7 +21,7 @@
 
 #include <f32file.h>
 #include <badesca.h>
-#include <GMXMLParser.h>
+#include <gmxmlparser.h>
 
 #include "CFScriptEngineInterface.h"
 #include "cfstarterobserver.h"
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/inc/cfscriptengine/Distribution.Policy.S60
--- a/contextframework/cfw/inc/cfscriptengine/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/inc/cfserver/Distribution.Policy.S60
--- a/contextframework/cfw/inc/cfserver/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/inc/cfservices/Distribution.Policy.S60
--- a/contextframework/cfw/inc/cfservices/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/inc/common/Distribution.Policy.S60
--- a/contextframework/cfw/inc/common/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/rom/Distribution.Policy.S60
--- a/contextframework/cfw/rom/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/src/Distribution.Policy.S60
--- a/contextframework/cfw/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/src/basicoperationsplugin/Distribution.Policy.S60
--- a/contextframework/cfw/src/basicoperationsplugin/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/src/cfactivatorengine/Distribution.Policy.S60
--- a/contextframework/cfw/src/cfactivatorengine/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/src/cfclient/Distribution.Policy.S60
--- a/contextframework/cfw/src/cfclient/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/src/cfcontextsourcemanager/Distribution.Policy.S60
--- a/contextframework/cfw/src/cfcontextsourcemanager/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/src/cfcontextsourcesettingsmanager/distribution.policy.s60
--- a/contextframework/cfw/src/cfcontextsourcesettingsmanager/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/src/cfoperationpluginservices/Distribution.Policy.S60
--- a/contextframework/cfw/src/cfoperationpluginservices/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/src/cfscriptengine/Distribution.Policy.S60
--- a/contextframework/cfw/src/cfscriptengine/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/src/cfserver/Distribution.Policy.S60
--- a/contextframework/cfw/src/cfserver/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/src/cfservices/Distribution.Policy.S60
--- a/contextframework/cfw/src/cfservices/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/cfwtest/distribution.policy.s60
--- a/contextframework/cfw/tsrc/cfwtest/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/cfwtest/group/distribution.policy.s60
--- a/contextframework/cfw/tsrc/cfwtest/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/distribution.policy.s60
--- a/contextframework/cfw/tsrc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/basic/BWINS/Distribution.Policy.S60
--- a/contextframework/cfw/tsrc/public/basic/BWINS/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/basic/EABI/Distribution.Policy.S60
--- a/contextframework/cfw/tsrc/public/basic/EABI/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/basic/MT_BasicOperationsPlugIn/distribution.policy.s60
--- a/contextframework/cfw/tsrc/public/basic/MT_BasicOperationsPlugIn/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/basic/MT_CFClient/distribution.policy.s60
--- a/contextframework/cfw/tsrc/public/basic/MT_CFClient/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/basic/MT_CFContextSourceManager/Distribution.Policy.S60
--- a/contextframework/cfw/tsrc/public/basic/MT_CFContextSourceManager/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/basic/MT_CFContextSourceSettingsManager/Distribution.Policy.S60
--- a/contextframework/cfw/tsrc/public/basic/MT_CFContextSourceSettingsManager/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/basic/MT_CFOperationPluginManager/distribution.policy.s60
--- a/contextframework/cfw/tsrc/public/basic/MT_CFOperationPluginManager/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/basic/MT_CFScriptEngine/Distribution.Policy.S60
--- a/contextframework/cfw/tsrc/public/basic/MT_CFScriptEngine/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/basic/TestActionPlugIn/Distribution.Policy.S60
--- a/contextframework/cfw/tsrc/public/basic/TestActionPlugIn/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/basic/TestActionPlugIn/data/distribution.policy.s60
--- a/contextframework/cfw/tsrc/public/basic/TestActionPlugIn/data/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/basic/TestActionPlugIn/group/distribution.policy.s60
--- a/contextframework/cfw/tsrc/public/basic/TestActionPlugIn/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/basic/TestActionPlugIn/inc/distribution.policy.s60
--- a/contextframework/cfw/tsrc/public/basic/TestActionPlugIn/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/basic/TestActionPlugIn/src/distribution.policy.s60
--- a/contextframework/cfw/tsrc/public/basic/TestActionPlugIn/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/basic/TestContextSourcePlugIn/Distribution.Policy.S60
--- a/contextframework/cfw/tsrc/public/basic/TestContextSourcePlugIn/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/basic/TestContextSourcePlugIn/data/Distribution.Policy.S60
--- a/contextframework/cfw/tsrc/public/basic/TestContextSourcePlugIn/data/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/basic/TestContextSourcePlugIn/group/Distribution.Policy.S60
--- a/contextframework/cfw/tsrc/public/basic/TestContextSourcePlugIn/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/basic/TestContextSourcePlugIn/inc/Distribution.Policy.S60
--- a/contextframework/cfw/tsrc/public/basic/TestContextSourcePlugIn/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/basic/TestContextSourcePlugIn/src/Distribution.Policy.S60
--- a/contextframework/cfw/tsrc/public/basic/TestContextSourcePlugIn/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/basic/UT_CCFContextManager/Distribution.Policy.S60
--- a/contextframework/cfw/tsrc/public/basic/UT_CCFContextManager/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/basic/UT_CCFEngine/Distribution.Policy.S60
--- a/contextframework/cfw/tsrc/public/basic/UT_CCFEngine/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/basic/UT_CFActivatorEngine/Distribution.Policy.S60
--- a/contextframework/cfw/tsrc/public/basic/UT_CFActivatorEngine/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/basic/UT_CFContextSourceManager/Distribution.Policy.S60
--- a/contextframework/cfw/tsrc/public/basic/UT_CFContextSourceManager/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/basic/UT_CFContextSourceSettingsManager/Distribution.Policy.S60
--- a/contextframework/cfw/tsrc/public/basic/UT_CFContextSourceSettingsManager/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/basic/UT_CFOperationPluginManager/distribution.policy.s60
--- a/contextframework/cfw/tsrc/public/basic/UT_CFOperationPluginManager/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/basic/common/distribution.policy.s60
--- a/contextframework/cfw/tsrc/public/basic/common/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/basic/data/distribution.policy.s60
--- a/contextframework/cfw/tsrc/public/basic/data/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/basic/data/testscripts/Distribution.Policy.S60
--- a/contextframework/cfw/tsrc/public/basic/data/testscripts/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/basic/data/testsettings/Distribution.Policy.S60
--- a/contextframework/cfw/tsrc/public/basic/data/testsettings/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/basic/data/testsettings/settingupgrade/Distribution.Policy.S60
--- a/contextframework/cfw/tsrc/public/basic/data/testsettings/settingupgrade/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/basic/distribution.policy.s60
--- a/contextframework/cfw/tsrc/public/basic/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/basic/group/distribution.policy.s60
--- a/contextframework/cfw/tsrc/public/basic/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/basic/mt_cfactionplugin/distribution.policy.s60
--- a/contextframework/cfw/tsrc/public/basic/mt_cfactionplugin/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/basic/mt_cfservices/distribution.policy.s60
--- a/contextframework/cfw/tsrc/public/basic/mt_cfservices/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/basic/mt_cfsisupgrade/action_v1/distribution.policy.s60
--- a/contextframework/cfw/tsrc/public/basic/mt_cfsisupgrade/action_v1/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/basic/mt_cfsisupgrade/action_v2/distribution.policy.s60
--- a/contextframework/cfw/tsrc/public/basic/mt_cfsisupgrade/action_v2/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/basic/mt_cfsisupgrade/contextsource_v1/distribution.policy.s60
--- a/contextframework/cfw/tsrc/public/basic/mt_cfsisupgrade/contextsource_v1/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/basic/mt_cfsisupgrade/contextsource_v2/distribution.policy.s60
--- a/contextframework/cfw/tsrc/public/basic/mt_cfsisupgrade/contextsource_v2/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/basic/mt_cfsisupgrade/distribution.policy.s60
--- a/contextframework/cfw/tsrc/public/basic/mt_cfsisupgrade/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/basic/mt_cfsisupgrade/operation_v1/distribution.policy.s60
--- a/contextframework/cfw/tsrc/public/basic/mt_cfsisupgrade/operation_v1/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/basic/mt_cfsisupgrade/operation_v2/distribution.policy.s60
--- a/contextframework/cfw/tsrc/public/basic/mt_cfsisupgrade/operation_v2/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/basic/mt_cfsisupgrade/operation_v3/distribution.policy.s60
--- a/contextframework/cfw/tsrc/public/basic/mt_cfsisupgrade/operation_v3/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/basic/rom/distribution.policy.s60
--- a/contextframework/cfw/tsrc/public/basic/rom/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/basic/sis/distribution.policy.s60
--- a/contextframework/cfw/tsrc/public/basic/sis/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfw/tsrc/public/distribution.policy.s60
--- a/contextframework/cfw/tsrc/public/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/ApplicationStateSourcePlugIn/Distribution.Policy.S60
--- a/contextframework/cfwplugins/ApplicationStateSourcePlugIn/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/ApplicationStateSourcePlugIn/data/Distribution.Policy.S60
--- a/contextframework/cfwplugins/ApplicationStateSourcePlugIn/data/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/ApplicationStateSourcePlugIn/group/ApplicationStateSourcePlugIn.mmp
--- a/contextframework/cfwplugins/ApplicationStateSourcePlugIn/group/ApplicationStateSourcePlugIn.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/contextframework/cfwplugins/ApplicationStateSourcePlugIn/group/ApplicationStateSourcePlugIn.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -19,7 +19,7 @@
 #include <platform_paths.hrh>
 #include "../inc/ApplicationStateSourcePluginConst.hrh"
 
-TARGET          ApplicationStateSourcePlugIn.dll
+TARGET          applicationstatesourceplugin.dll
 TARGETTYPE      PLUGIN
 UID             0x10009D8D KApplicationStateSourcePluginDllUid
 CAPABILITY      CAP_ECOM_PLUGIN
@@ -39,7 +39,7 @@
 
 SOURCEPATH      ../data
 START RESOURCE  ApplicationStateSourcePlugIn.rss
-TARGET          ApplicationStateSourcePlugIn.rsc
+TARGET          applicationstatesourceplugin.rsc
 TARGETPATH      /resource/plugins
 END
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/ApplicationStateSourcePlugIn/group/Distribution.Policy.S60
--- a/contextframework/cfwplugins/ApplicationStateSourcePlugIn/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/ApplicationStateSourcePlugIn/inc/ApplicationStateSourcePlugin.h
--- a/contextframework/cfwplugins/ApplicationStateSourcePlugIn/inc/ApplicationStateSourcePlugin.h	Tue Feb 02 10:12:00 2010 +0200
+++ b/contextframework/cfwplugins/ApplicationStateSourcePlugIn/inc/ApplicationStateSourcePlugin.h	Fri Apr 16 15:08:06 2010 +0300
@@ -29,14 +29,30 @@
 #include <cfcontextsourceplugin.h>
 #include <cfcontextobject.h>
 #include <cenrepnotifyhandler.h>
-
+#include <w32std.h>
+#include <apgwgnam.h>
 #include "cfapplicationstatesettings.h"
 #include "uidorientationpair.h"
 
 // FORWARD DECLARATIONS
 class CRepository;
 class CCenRepNotifyHandler;
+// FORWARD DECLARATIONS
+class CWsEventHandler;
 
+NONSHARABLE_CLASS( MWsEventObserver )
+    {
+public:
+
+    /**
+     * Handles window server event.
+     * 
+     * @since S60 5.0
+     * @param aEvent New window server event.
+     * @return None.
+     */
+    virtual void HandleWsEventL( RWsSession& aWsSession ) = 0;    
+    };
 // CLASS DECLARATION
 
 /**
@@ -50,7 +66,7 @@
  */
 NONSHARABLE_CLASS( CApplicationStateSourcePlugIn ): 
 	public CCFContextSourcePlugIn,
-	public MVwsSessionWrapperObserver,
+	public MWsEventObserver,
 	public MCenRepNotifyHandlerCallback
     {
 public: // Constructors and destructor
@@ -75,10 +91,7 @@
     // @see CCFContextSourcePlugIn
     void InitializeL();
 
-public: // From MVwsSessionWrapperObserver
 
-    // @see MVwsSessionWrapperObserver
-    void HandleViewEventL( const TVwsViewEvent& aEvent );
 
 public: // From MCenRepNotifyHandlerCallback
 
@@ -110,7 +123,7 @@
     
     // Initialize the fg application context
     void InitializeFgApplicationL();
-    
+    void HandleWsEventL( RWsSession& aWsSession );
     // Handles the view server event
     void DoHandleViewEventL( const TVwsViewEvent& aEvent );
     
@@ -148,6 +161,7 @@
 
     // Foreground application setting list
     RApplicationStateSettingsPointerArray iApplicationSettings;
+    CWsEventHandler* iWsEventHandler;
     
     // Previous foreground application orientation
     TPtrC iPreviousOrientation;
@@ -164,5 +178,67 @@
     // KCRUidDefaultAppOrientation listener
     CCenRepNotifyHandler* iCRAppOrientationListener;
     };
+/**
+ * Listens events from window server and forwards them to observer.
+ */
+NONSHARABLE_CLASS( CWsEventHandler ): public CActive
+    {
+public:
 
+    /**
+     * Symbian two phased constructors.
+     *
+     * @since S60 5.0
+     * @param None.
+     * @return CDisplayServiceUILayout
+     */
+    static CWsEventHandler* NewL( MWsEventObserver& aObserver );
+    static CWsEventHandler* NewLC( MWsEventObserver& aObserver );
+
+    /**
+     * C++ destructor.
+     */
+    virtual ~CWsEventHandler();
+    
+public:
+    
+    /**
+     * Start event listening.
+     * 
+     * @since S60 5.0
+     * @param None.
+     * @return None.
+     */
+    void IssueRequest();
+    
+protected:
+    
+    // @see CActive
+    virtual void RunL();
+    
+    // @see CActive
+    virtual void DoCancel(); 
+    
+    // @see CActive
+    virtual TInt RunError( TInt aError ); 
+    
+private:
+
+    CWsEventHandler( MWsEventObserver& aObserver );
+    void ConstructL();
+
+private: // Data
+    
+    /** Observer */
+    MWsEventObserver& iObserver;
+
+    /** Window server session */
+    RWsSession iWsSession;
+    
+    /** Window group for receiving window server events */
+    RWindowGroup* iWindowGroup;
+    
+    /** Window group name to hide it from the task manager */
+    CApaWindowGroupName* iWindowGroupName;
+    };
 #endif // C_APPLICATIONSTATESOURCEPLUGIN_H
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/ApplicationStateSourcePlugIn/inc/Distribution.Policy.S60
--- a/contextframework/cfwplugins/ApplicationStateSourcePlugIn/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/ApplicationStateSourcePlugIn/rom/distribution.policy.s60
--- a/contextframework/cfwplugins/ApplicationStateSourcePlugIn/rom/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/ApplicationStateSourcePlugIn/src/ApplicationStateSourcePlugin.cpp
--- a/contextframework/cfwplugins/ApplicationStateSourcePlugIn/src/ApplicationStateSourcePlugin.cpp	Tue Feb 02 10:12:00 2010 +0200
+++ b/contextframework/cfwplugins/ApplicationStateSourcePlugIn/src/ApplicationStateSourcePlugin.cpp	Fri Apr 16 15:08:06 2010 +0300
@@ -26,10 +26,10 @@
 #include <apgwgnam.h>
 #include <applicationorientation.h>
 #include <aknappui.h>
+#include <coedef.h>
 #ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
 #include <vwsdefpartner.h>
 #endif
-
 #include "ApplicationStateSourcePlugin.h"
 #include "ApplicationStateSourceContextDef.h"
 #include "ContextFrameworkPrivateCRKeys.h"
@@ -82,6 +82,8 @@
     iDefaultAppName = KApplicationStateDefaultValue().AllocL();
     iDefaultViewName = KApplicationStateDefaultValue().AllocL();
     iContext = CCFContextObject::NewL();
+    iWsEventHandler = CWsEventHandler::NewL( *this );
+    iWsEventHandler->IssueRequest();
     }
 
 // -----------------------------------------------------------------------------
@@ -131,7 +133,7 @@
     delete iCRAppOrientation;
     iApplicationSettings.ResetAndDestroy();
     delete iSettings;
-    delete iVws;
+    
     delete iDefaultViewName;
     delete iDefaultAppName;
     delete iApplDefaultState;
@@ -223,8 +225,7 @@
         iSettings = NULL;
         }
 
-    iVws = CVwsSessionWrapper::NewL( *this );
-    iVws->NotifyNextActivation();
+    
     }
 
 // -----------------------------------------------------------------------------
@@ -351,33 +352,7 @@
         }
     }
 
-// -----------------------------------------------------------------------------
-// CApplicationStateSourcePlugIn::HandleViewEventL
-// Maps view activations to contexts.
-// -----------------------------------------------------------------------------
-//
-void CApplicationStateSourcePlugIn::HandleViewEventL(
-    const TVwsViewEvent& aEvent )
-    {
-    FUNC_LOG;
 
-    // Renew listening
-    iVws->NotifyNextActivation();
-
-    // Handle the view server event
-    DoHandleViewEventL( aEvent );
-
-    // Log event members!
-    INFO_1( "HandleViewEventL: eventType: [%d]", aEvent.iEventType );
-    
-    INFO_2( "HandleViewEventL: viewOne [appUid:%S] [viewUid%S]",
-        &(const TDesC&)aEvent.iViewOneId.iAppUid.Name(),
-        &(const TDesC&)aEvent.iViewOneId.iViewUid.Name() );
-    
-    INFO_2( "HandleViewEventL: viewTwo [appUid:%S] [viewUid%S]",
-        &(const TDesC&)aEvent.iViewTwoId.iAppUid.Name(),
-        &(const TDesC&)aEvent.iViewTwoId.iViewUid.Name() );
-    }
 
 //------------------------------------------------------------------------------
 // CApplicationStateSourcePlugIn::HandleNotifyGeneric
@@ -745,3 +720,223 @@
         }
     return index;
     }
+void CApplicationStateSourcePlugIn::HandleWsEventL( RWsSession& aWsSession )
+	{
+	TUid appUid( TUid::Null() );
+    TPtrC bgApp( *iDefaultAppName );
+    TPtrC fgApp( *iDefaultAppName );
+    TPtrC fgView( *iDefaultViewName );
+
+	TInt focWndGrp( aWsSession.GetFocusWindowGroup() );
+    CApaWindowGroupName* wndGrpName = CApaWindowGroupName::NewL( aWsSession );
+    CleanupStack::PushL( wndGrpName );
+    wndGrpName->ConstructFromWgIdL( focWndGrp );
+    appUid = wndGrpName->AppUid();
+
+    for ( TInt i = 0; i < iApplicationSettings.Count(); ++i )
+        {
+        CCFApplicationStateSettings* appSettings = iApplicationSettings[ i ];
+        if ( appUid == appSettings->Uid() )
+            {
+            fgApp.Set( appSettings->Name() );
+            appSettings->GetViewName( appUid, fgView );
+            bgApp.Set( iPreviousForegroundApplication );
+            break;
+            }
+        }
+    TBool publishFgApp( EFalse );
+    TBool publishFgView( EFalse );
+    TBool publishBgApp( EFalse );
+
+    if ( iPreviousForegroundApplication.Compare( fgApp ) != 0 )
+        {
+        publishFgApp = ETrue;
+        }
+    else if ( iPreviousForegroundView.Compare( fgView ) != 0 )
+        {
+        publishFgView = ETrue;
+        }
+
+    if ( bgApp != fgApp )
+        {
+        publishBgApp = ETrue;
+        }
+
+    iPreviousForegroundApplication.Set( fgApp ); // Store for next round
+    iPreviousForegroundView.Set( fgView );
+
+   RThread thread;
+
+    if ( publishFgApp )
+        {
+        iContext->SetTypeL( KApplicationStateForegroundApplicationType );
+        iContext->SetValueL( fgApp );
+        iCF.PublishContext( *iContext, thread );
+        }
+
+    if ( publishFgApp || publishFgView )
+        {
+        iContext->SetTypeL( KApplicationStateForegroundApplicationViewType );
+        iContext->SetValueL( fgView );
+        iCF.PublishContext( *iContext, thread );
+        }
+
+    if ( publishBgApp )
+        {
+        iContext->SetTypeL( KApplicationStateBackgroundApplicationType );
+        iContext->SetValueL( bgApp );
+        iCF.PublishContext( *iContext, thread );
+        }
+	
+	thread.Close();
+    CleanupStack::PopAndDestroy( wndGrpName );
+
+	}
+
+// ======================== CWsEventHandler ========================
+
+// ---------------------------------------------------------------------------
+// C++ constructor.
+// ---------------------------------------------------------------------------
+//
+CWsEventHandler::CWsEventHandler( MWsEventObserver& aObserver ):
+    CActive( CActive::EPriorityStandard ),
+    iObserver( aObserver )
+    {
+    CActiveScheduler::Add( this );
+    }
+
+// ---------------------------------------------------------------------------
+// Symbian 2nd phase constructor.
+// ---------------------------------------------------------------------------
+//
+void CWsEventHandler::ConstructL()
+    {
+    // Connect to window server server
+    User::LeaveIfError( iWsSession.Connect() );
+    
+    // Construct window group
+    iWindowGroup = new( ELeave ) RWindowGroup( iWsSession );
+    User::LeaveIfError( iWindowGroup->Construct( (TUint32)this, EFalse ) );
+    User::LeaveIfError( iWindowGroup->EnableGroupChangeEvents() );
+    iWindowGroup->SetOrdinalPosition( 0, ECoeWinPriorityNeverAtFront );
+    iWindowGroup->EnableReceiptOfFocus( EFalse );
+    
+    // Hide the invisible window from the task manager
+    iWindowGroupName = CApaWindowGroupName::NewL( iWsSession );
+    iWindowGroupName->SetHidden( ETrue );
+    iWindowGroupName->SetWindowGroupName( *iWindowGroup );
+
+    }
+// ---------------------------------------------------------------------------
+// Symbian two phased constructor.
+// ---------------------------------------------------------------------------
+//
+CWsEventHandler* CWsEventHandler::NewL( MWsEventObserver& aObserver )
+    {
+    CWsEventHandler* self = CWsEventHandler::NewLC( aObserver );
+    CleanupStack::Pop( self );
+    
+    return self;
+    }
+
+// ---------------------------------------------------------------------------
+// Symbian two phased constructor.
+// Leaves pointer in the cleanup stack.
+// ---------------------------------------------------------------------------
+//
+CWsEventHandler* CWsEventHandler::NewLC( MWsEventObserver& aObserver )
+    {
+    CWsEventHandler* self = new ( ELeave ) CWsEventHandler( aObserver );
+    CleanupStack::PushL( self );
+    self->ConstructL();
+    
+    return self;
+    }
+
+// ---------------------------------------------------------------------------
+// C++ destructor.
+// ---------------------------------------------------------------------------
+//
+CWsEventHandler::~CWsEventHandler()
+    {
+    Cancel();
+        
+    // Cleanup window group name
+    delete iWindowGroupName;
+       
+    // Cleanup window group
+    if( iWindowGroup )
+        {
+        iWindowGroup->DisableGroupChangeEvents();
+        iWindowGroup->Close();
+        delete iWindowGroup;
+        }
+    
+    // Cleanup window server session
+    iWsSession.Close();
+    }
+
+//------------------------------------------------------------------------------
+// CWsEventHandler::IssueRequest
+//------------------------------------------------------------------------------
+//
+void CWsEventHandler::IssueRequest()
+    {
+    // Request events from window server
+    iWsSession.EventReady( &iStatus );
+    SetActive();
+    }
+
+
+//------------------------------------------------------------------------------
+// CWsEventHandler::RunL
+//------------------------------------------------------------------------------
+//
+void CWsEventHandler::RunL()
+    {
+    TInt err = iStatus.Int();
+    if( err == KErrNone )
+        {
+        // No errors occured, fetch event
+        TWsEvent wsEvent;
+        iWsSession.GetEvent( wsEvent );
+        
+        // Continue listening
+        IssueRequest();
+		switch (wsEvent.Type()) 
+			{
+		case EEventWindowGroupsChanged :
+	       // Forward event to observer
+	       iObserver.HandleWsEventL( iWsSession );
+			break;
+		default:
+			break;
+			}
+        }
+    }
+
+//------------------------------------------------------------------------------
+// CWsEventHandler::DoCancel
+//------------------------------------------------------------------------------
+//
+void CWsEventHandler::DoCancel()
+    {
+    // Cancel event ready from window server
+    iWsSession.EventReadyCancel();
+    }
+
+//------------------------------------------------------------------------------
+// CWsEventHandler::RunError
+//------------------------------------------------------------------------------
+//
+TInt CWsEventHandler::RunError( TInt /*aError*/ )
+    {
+    // Issue a new request, other error handling is not performed since the
+    // problem has occured in the observer code
+    IssueRequest();
+    
+    return KErrNone;
+    }
+
+	
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/ApplicationStateSourcePlugIn/src/Distribution.Policy.S60
--- a/contextframework/cfwplugins/ApplicationStateSourcePlugIn/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/CallStateSourcePlugIn/Distribution.Policy.S60
--- a/contextframework/cfwplugins/CallStateSourcePlugIn/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/CallStateSourcePlugIn/context/Distribution.Policy.S60
--- a/contextframework/cfwplugins/CallStateSourcePlugIn/context/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/CallStateSourcePlugIn/data/Distribution.Policy.S60
--- a/contextframework/cfwplugins/CallStateSourcePlugIn/data/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/CallStateSourcePlugIn/group/CallStateSourcePlugIn.mmp
--- a/contextframework/cfwplugins/CallStateSourcePlugIn/group/CallStateSourcePlugIn.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/contextframework/cfwplugins/CallStateSourcePlugIn/group/CallStateSourcePlugIn.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -19,7 +19,7 @@
 #include <platform_paths.hrh>
 #include "../inc/CallStateSourcePlugInConst.hrh"
 
-TARGET          CallStateSourcePlugIn.dll
+TARGET          callstatesourceplugin.dll
 TARGETTYPE      PLUGIN
 UID             0x10009D8D KCallStateSourcePluginDllUid
 CAPABILITY      ALL -TCB
@@ -36,7 +36,7 @@
 
 SOURCEPATH      ../data
 START RESOURCE	CallStateSourcePlugIn.rss
-TARGET 		    CallStateSourcePlugIn.rsc
+TARGET 		    callstatesourceplugin.rsc
 TARGETPATH 	    /resource/plugins
 END
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/CallStateSourcePlugIn/group/Distribution.Policy.S60
--- a/contextframework/cfwplugins/CallStateSourcePlugIn/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/CallStateSourcePlugIn/inc/Distribution.Policy.S60
--- a/contextframework/cfwplugins/CallStateSourcePlugIn/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/CallStateSourcePlugIn/rom/Distribution.Policy.S60
--- a/contextframework/cfwplugins/CallStateSourcePlugIn/rom/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/CallStateSourcePlugIn/src/Distribution.Policy.S60
--- a/contextframework/cfwplugins/CallStateSourcePlugIn/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/Distribution.Policy.S60
--- a/contextframework/cfwplugins/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/PSStateSourcePlugIn/Distribution.Policy.S60
--- a/contextframework/cfwplugins/PSStateSourcePlugIn/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/PSStateSourcePlugIn/context/Distribution.Policy.S60
--- a/contextframework/cfwplugins/PSStateSourcePlugIn/context/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/PSStateSourcePlugIn/data/Distribution.Policy.S60
--- a/contextframework/cfwplugins/PSStateSourcePlugIn/data/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/PSStateSourcePlugIn/group/Distribution.Policy.S60
--- a/contextframework/cfwplugins/PSStateSourcePlugIn/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/PSStateSourcePlugIn/group/psstatesourceplugin.mmp
--- a/contextframework/cfwplugins/PSStateSourcePlugIn/group/psstatesourceplugin.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/contextframework/cfwplugins/PSStateSourcePlugIn/group/psstatesourceplugin.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -19,7 +19,7 @@
 #include <platform_paths.hrh>
 #include "../inc/psstatesourcepluginconst.hrh"
 
-TARGET          PSStateSourcePlugIn.dll
+TARGET          psstatesourceplugin.dll
 TARGETTYPE      PLUGIN
 UID             0x10009D8D KPSStateSourcePluginDllUid
 CAPABILITY      ALL -TCB
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/PSStateSourcePlugIn/inc/Distribution.Policy.S60
--- a/contextframework/cfwplugins/PSStateSourcePlugIn/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/PSStateSourcePlugIn/rom/Distribution.Policy.S60
--- a/contextframework/cfwplugins/PSStateSourcePlugIn/rom/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/PSStateSourcePlugIn/src/Distribution.Policy.S60
--- a/contextframework/cfwplugins/PSStateSourcePlugIn/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/cenrepsourceplugin/data/distribution.policy.s60
--- a/contextframework/cfwplugins/cenrepsourceplugin/data/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/cenrepsourceplugin/distribution.policy.s60
--- a/contextframework/cfwplugins/cenrepsourceplugin/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/cenrepsourceplugin/group/distribution.policy.s60
--- a/contextframework/cfwplugins/cenrepsourceplugin/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/cenrepsourceplugin/inc/distribution.policy.s60
--- a/contextframework/cfwplugins/cenrepsourceplugin/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/cenrepsourceplugin/rom/distribution.policy.s60
--- a/contextframework/cfwplugins/cenrepsourceplugin/rom/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/cenrepsourceplugin/src/distribution.policy.s60
--- a/contextframework/cfwplugins/cenrepsourceplugin/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/displaysourceplugin/Distribution.Policy.S60
--- a/contextframework/cfwplugins/displaysourceplugin/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/displaysourceplugin/data/Distribution.Policy.S60
--- a/contextframework/cfwplugins/displaysourceplugin/data/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/displaysourceplugin/group/Distribution.Policy.S60
--- a/contextframework/cfwplugins/displaysourceplugin/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/displaysourceplugin/inc/Distribution.Policy.S60
--- a/contextframework/cfwplugins/displaysourceplugin/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/displaysourceplugin/rom/Distribution.Policy.S60
--- a/contextframework/cfwplugins/displaysourceplugin/rom/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/displaysourceplugin/src/Distribution.Policy.S60
--- a/contextframework/cfwplugins/displaysourceplugin/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/group/Distribution.Policy.S60
--- a/contextframework/cfwplugins/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/group/bld.inf
--- a/contextframework/cfwplugins/group/bld.inf	Tue Feb 02 10:12:00 2010 +0200
+++ b/contextframework/cfwplugins/group/bld.inf	Fri Apr 16 15:08:06 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2008 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2006-2010 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"
@@ -23,7 +23,7 @@
 #include "../ApplicationStateSourcePlugIn/group/bld.inf"
 #include "../sensorsourceplugin/group/bld.inf"
 #include "../vibraactionplugin/group/bld.inf"
-#include "../orientationactionplugin/group/bld.inf"
+//#include "../orientationactionplugin/group/bld.inf"
 #include "../cenrepsourceplugin/group/bld.inf"
 // moved from pcfw
 #include "../PSStateSourcePlugIn/group/bld.inf"
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/orientationactionplugin/data/distribution.policy.s60
--- a/contextframework/cfwplugins/orientationactionplugin/data/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/orientationactionplugin/distribution.policy.s60
--- a/contextframework/cfwplugins/orientationactionplugin/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/orientationactionplugin/group/distribution.policy.s60
--- a/contextframework/cfwplugins/orientationactionplugin/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/orientationactionplugin/group/orientationactionplugin.mmp
--- a/contextframework/cfwplugins/orientationactionplugin/group/orientationactionplugin.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/contextframework/cfwplugins/orientationactionplugin/group/orientationactionplugin.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -20,7 +20,7 @@
 #include "../inc/traceconfiguration.hrh"
 #include "../inc/orientationactionpluginconst.hrh"
 
-TARGET          OrientationActionPlugin.dll
+TARGET          orientationactionplugin.dll
 TARGETTYPE      PLUGIN
 UID             0x10009D8D KOrientationActionPlugInDllUid
 CAPABILITY      CAP_ECOM_PLUGIN
@@ -50,7 +50,7 @@
 LIBRARY         cfactivatorengine.lib
 LIBRARY         cfservices.lib
 LIBRARY         centralrepository.lib
-LIBRARY         Avkon.lib
+LIBRARY         avkon.lib
 LIBRARY         apgrfx.lib
 #ifdef TRACE_INTO_FILE
 LIBRARY         flogger.lib
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/orientationactionplugin/inc/distribution.policy.s60
--- a/contextframework/cfwplugins/orientationactionplugin/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/orientationactionplugin/rom/distribution.policy.s60
--- a/contextframework/cfwplugins/orientationactionplugin/rom/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/orientationactionplugin/src/distribution.policy.s60
--- a/contextframework/cfwplugins/orientationactionplugin/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/sensorsourceplugin/context/distribution.policy.s60
--- a/contextframework/cfwplugins/sensorsourceplugin/context/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/sensorsourceplugin/data/distribution.policy.s60
--- a/contextframework/cfwplugins/sensorsourceplugin/data/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/sensorsourceplugin/distribution.policy.s60
--- a/contextframework/cfwplugins/sensorsourceplugin/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/sensorsourceplugin/group/distribution.policy.s60
--- a/contextframework/cfwplugins/sensorsourceplugin/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/sensorsourceplugin/inc/distribution.policy.s60
--- a/contextframework/cfwplugins/sensorsourceplugin/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/sensorsourceplugin/rom/distribution.policy.s60
--- a/contextframework/cfwplugins/sensorsourceplugin/rom/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/sensorsourceplugin/src/distribution.policy.s60
--- a/contextframework/cfwplugins/sensorsourceplugin/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/vibraactionplugin/data/distribution.policy.s60
--- a/contextframework/cfwplugins/vibraactionplugin/data/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/vibraactionplugin/distribution.policy.s60
--- a/contextframework/cfwplugins/vibraactionplugin/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/vibraactionplugin/group/distribution.policy.s60
--- a/contextframework/cfwplugins/vibraactionplugin/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/vibraactionplugin/inc/distribution.policy.s60
--- a/contextframework/cfwplugins/vibraactionplugin/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/vibraactionplugin/rom/distribution.policy.s60
--- a/contextframework/cfwplugins/vibraactionplugin/rom/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/cfwplugins/vibraactionplugin/src/distribution.policy.s60
--- a/contextframework/cfwplugins/vibraactionplugin/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 contextframework/group/Distribution.Policy.S60
--- a/contextframework/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/ATCmdPlugin/data/2001A273.rss
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/ATCmdPlugin/data/2001A273.rss	Fri Apr 16 15:08:06 2010 +0300
@@ -0,0 +1,48 @@
+
+
+ // Copyright (c) 2008-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:
+ // ECOM DLL UID:        0x2001A273
+ // Interface UID :      0x2001CBEE
+ // Implementation UID : 0x2001A274
+
+
+#include "../inc/atcmdpluginuids.hrh"
+#include <ecom/registryinfo.rh>
+
+
+RESOURCE REGISTRY_INFO theInfo
+	{
+	// UID for the DLL
+	dll_uid = KUidATCmdEcomDll;
+	// Declare array of interface info
+	interfaces =
+		{
+		INTERFACE_INFO
+			{
+			// UID of interface that is implemented
+			interface_uid = 0x2001CBEE; //ATEXT_INTERFACE_DUN_UID
+			implementations =
+				{
+				IMPLEMENTATION_INFO
+					{
+					implementation_uid = KUidATCmdEcomImpl1;
+					version_no = 1;
+					display_name = " CKPD command Imp";
+					default_data = "PAT+CKPD|PAT+CTSA|PAT+CBKLT";
+					opaque_data = "";
+					}
+				};
+			}
+		};
+	}
+
+// End of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/ATCmdPlugin/data/atcmdpluginresource.rss
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/ATCmdPlugin/data/atcmdpluginresource.rss	Fri Apr 16 15:08:06 2010 +0300
@@ -0,0 +1,252 @@
+
+ // Copyright (c) 2008-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: ATCmdplugin resource definitions.
+ 
+//  RESOURCE IDENTIFIER
+NAME    ATCD
+
+#include <eikon.rh>
+#include <e32keys.h>
+#include <ncp_consts.hrh>
+#include "atcmdplugin.rh"
+
+
+//  CONSTANTS
+
+//  MACROS  
+
+//  RESOURCE DEFINITIONS 
+
+//-----------------------------------------------------------------------------
+//   
+//    -
+//    Resource signature
+//
+//-----------------------------------------------------------------------------
+//
+RESOURCE RSS_SIGNATURE {}
+
+//-----------------------------------------------------------------------------
+//   
+//    -
+//    Resource filename
+//
+//-----------------------------------------------------------------------------
+//
+RESOURCE TBUF 
+    { 
+    buf = "atcmdpluginresource"; 
+    }
+
+
+
+// -----------------------------------------------------------------------------
+//
+//    r_atcmdplugin_translationtable
+//    Translation table
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE ARRAY r_atcmdplugin_translationtable
+    {    
+    items =
+        {
+        ATCMDPLUGIN_TRANSLATION
+            {
+            code = EStdKeyHash;
+            text = "#";
+            },
+        ATCMDPLUGIN_TRANSLATION
+            {
+            code = '%';
+            text = "%";
+            },
+        ATCMDPLUGIN_TRANSLATION
+            {
+            code = EStdKeyNkpAsterisk;
+            text = "*";
+            },
+        ATCMDPLUGIN_TRANSLATION
+            {
+            code = '0';
+            text = "0";
+            },
+        ATCMDPLUGIN_TRANSLATION
+            {
+            code = '1';
+            text = "1";
+            },
+        ATCMDPLUGIN_TRANSLATION
+            {
+            code = '2';
+            text = "2";
+            },
+        ATCMDPLUGIN_TRANSLATION
+            {
+            code = '3';
+            text = "3";
+            },
+        ATCMDPLUGIN_TRANSLATION
+            {
+            code = '4';
+            text = "4";
+            },
+        ATCMDPLUGIN_TRANSLATION
+            {
+            code = '5';
+            text = "5";
+            },
+        ATCMDPLUGIN_TRANSLATION
+            {
+            code = '6';
+            text = "6";
+            },
+        ATCMDPLUGIN_TRANSLATION
+            {
+            code = '7';
+            text = "7";
+            },
+        ATCMDPLUGIN_TRANSLATION
+            {
+            code = '8';
+            text = "8";
+            },
+        ATCMDPLUGIN_TRANSLATION
+            {
+            code = '9';
+            text = "9";
+            },
+        ATCMDPLUGIN_TRANSLATION
+            {
+            code = EStdKeyLeftArrow;
+            text = "<";
+            },
+        ATCMDPLUGIN_TRANSLATION
+            {
+            code = EStdKeyRightArrow;
+            text = ">";
+            },
+        ATCMDPLUGIN_TRANSLATION
+            {
+            code = EKeyNull;
+            text = "\"";
+            },
+        ATCMDPLUGIN_TRANSLATION
+            {
+            code = EKeyNull;
+            text = ";";
+            },
+        ATCMDPLUGIN_TRANSLATION
+            {
+            // Escape character for manufacturer specific keys
+            code = -1;
+            text = ":";
+            },
+        ATCMDPLUGIN_TRANSLATION
+            {
+            code = 'P';
+            text = "w";
+            },
+        ATCMDPLUGIN_TRANSLATION
+            {
+            code = EStdKeyDevice0; // left SK
+            text = "[";
+            },
+        ATCMDPLUGIN_TRANSLATION
+            {
+            code = EStdKeyDevice1; // right SK
+            text = "]";
+            },
+        ATCMDPLUGIN_TRANSLATION
+            {
+            code = EStdKeyIncVolume;
+            text = "u";
+            },
+        ATCMDPLUGIN_TRANSLATION
+            {
+            code = EStdKeyDecVolume;
+            text = "d";
+            },
+        ATCMDPLUGIN_TRANSLATION
+            {
+            code = EStdKeyNo;
+            text = "c";
+            },
+        ATCMDPLUGIN_TRANSLATION
+            {
+            code = EStdKeyYes;
+            text = "s";
+            },
+        ATCMDPLUGIN_TRANSLATION
+            {
+            code = EStdKeyNo;
+            text = "e";
+            },
+        ATCMDPLUGIN_TRANSLATION
+            {
+            code = EStdKeyDownArrow;
+            text = "v";
+            },
+        ATCMDPLUGIN_TRANSLATION
+            {
+            code = EStdKeyUpArrow;
+            text = "^";
+            },            
+        ATCMDPLUGIN_TRANSLATION
+            {
+            code = EStdKeyApplication0; // menu
+            text = "m";
+            }, 
+        ATCMDPLUGIN_TRANSLATION
+            {
+            code = EStdKeyDevice2; // power
+            text = "p";
+            },             
+        ATCMDPLUGIN_TRANSLATION
+            {
+            code = BSW_EStdProductKey09; // mute
+            text = "q";
+            },
+        ATCMDPLUGIN_TRANSLATION
+            {
+            code = EStdKeyNkpPlus;
+            text = ":+";
+            },
+        ATCMDPLUGIN_TRANSLATION
+            {
+            code = EStdKeyBackspace;
+            text = "y";
+            },
+       ATCMDPLUGIN_TRANSLATION
+            {
+            code = EStdKeyDevice1;
+            text = "y]";
+            },
+       ATCMDPLUGIN_TRANSLATION
+            {
+            code = EStdKeyDevice3;
+            text = ":J";
+            },
+       ATCMDPLUGIN_TRANSLATION
+            {
+            code = EKeyNull;
+            text = "\n";
+            },
+        ATCMDPLUGIN_TRANSLATION
+            {
+            code = EKeyNull;
+            text = "\r";
+            }
+        };
+    }
+
+
+// End of File
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/ATCmdPlugin/group/atcmdplugin.mmp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/ATCmdPlugin/group/atcmdplugin.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -0,0 +1,66 @@
+
+/*
+ * Copyright (c) 2008-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 :
+ *
+ */
+
+
+#include <platform_paths.hrh>
+#include <data_caging_paths.hrh>
+#include "../inc/atcmdpluginuids.hrh"
+
+CAPABILITY 	    CAP_ECOM_PLUGIN
+VENDORID        VID_DEFAULT
+TARGET          atcmdplugin.dll
+TARGETTYPE	    PLUGIN
+UID             0x10009D8D KUidATCmdEcomDll
+
+SOURCEPATH      ../src
+SOURCE          main.cpp
+SOURCE          atcmdplugin.cpp
+SOURCE          atcmd.cpp
+
+USERINCLUDE     ../inc
+
+MW_LAYER_SYSTEMINCLUDE
+
+START RESOURCE  ../data/2001A273.rss
+TARGET          atcmdplugin.rsc
+END
+
+//not actually localized
+//LANG	          SC
+
+START RESOURCE  ../data/atcmdpluginresource.rss
+HEADER
+TARGETPATH      APP_RESOURCE_DIR
+END  // RESOURCE
+
+LIBRARY 		apgrfx.lib
+LIBRARY			cone.lib
+LIBRARY	        ecom.lib
+LIBRARY			eikcore.lib
+LIBRARY         euser.lib
+LIBRARY         atextpluginbase.lib
+LIBRARY         bafl.lib
+LIBRARY	        efsrv.lib
+LIBRARY         ws32.lib
+LIBRARY         hwrmlightclient.lib
+LIBRARY         hal.lib
+
+DEBUGLIBRARY    flogger.lib
+
+
+
+
+// End of File
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/ATCmdPlugin/group/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/ATCmdPlugin/group/bld.inf	Fri Apr 16 15:08:06 2010 +0300
@@ -0,0 +1,34 @@
+
+/*
+ * Copyright (c) 2008-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 :This file provides the information required for building the
+ *              atcmdpluginecom.dll
+ *
+ */
+
+
+#include <platform_paths.hrh>
+
+PRJ_PLATFORMS
+
+PRJ_EXPORTS
+../rom/atcmdplugin.iby   CORE_MW_LAYER_IBY_EXPORT_PATH(atcmdplugin.iby)
+
+PRJ_TESTEXPORTS
+
+PRJ_MMPFILES
+atcmdplugin.mmp
+
+PRJ_TESTMMPFILES
+
+// End of File
+
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/ATCmdPlugin/inc/atcmd.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/ATCmdPlugin/inc/atcmd.h	Fri Apr 16 15:08:06 2010 +0300
@@ -0,0 +1,56 @@
+
+/*
+ * Copyright (c) 2008-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 :
+ *
+ */
+
+
+#ifndef __ATCMD_H
+#define __ATCMD_H
+
+// INCLUDES
+#include <e32base.h>
+
+// FORWARD DECLARATIONS
+
+// CLASS DECLARATION
+class TATCkpdCmd
+  	{
+    public:
+        inline TATCkpdCmd() {}
+    public:
+        TInt iCode;
+        TTimeIntervalMicroSeconds32 iStrokeDelay;
+        TTimeIntervalMicroSeconds32 iStrokeTime;
+    };
+
+class CATCmdTranslation
+    : public CBase
+    {
+    public:
+        CATCmdTranslation( HBufC8& aParam, const TInt aCode );
+        ~CATCmdTranslation();
+    public:
+        TInt Code() const;
+        TPtrC8 Param() const;
+    private:
+        HBufC8* iParam;
+        const TInt iCode;
+
+    };
+
+
+
+#endif // __ATCMD_H
+            
+// End of File
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/ATCmdPlugin/inc/atcmdplugin.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/ATCmdPlugin/inc/atcmdplugin.h	Fri Apr 16 15:08:06 2010 +0300
@@ -0,0 +1,260 @@
+
+/*
+ * Copyright (c) 2008-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 : ATCmdplugin class declaration.
+ *
+ */
+
+
+
+#ifndef __ATCMDPLUGINECOM_H
+#define __ATCMDPLUGINECOM_H
+
+// INCLUDES
+#include <atextpluginbase.h>
+#include <w32std.h>
+#include <hwrmlight.h>
+#include "matcmdtimer.h"
+#include "atcmd.h"
+
+// FORWARD DECLARATIONS
+class CCoeEnv;
+
+// CLASS DECLARATION
+
+/**
+*  CATCmdPluginEcom
+*  -
+*/
+class CATCmdPluginEcom : public CATExtPluginBase, public MATCmdTimer, public MHWRMLightObserver
+  	{
+  	public: // Constructors, destructor
+        /**
+        * Two-phased constructor.
+        */
+        static CATCmdPluginEcom* NewL();
+        
+        /**
+        * C++ Destructor.
+        */
+        ~CATCmdPluginEcom();
+        
+        /**
+         * From MHWRMLightObserver
+         */
+        void LightStatusChanged (TInt aTarget, CHWRMLight::TLightStatus aStatus);
+        
+        void HandleCommandCancel();
+        
+        void ReportConnectionName( const TDesC8& aName );
+        
+        
+        TInt NextReplyPartLength();
+
+        /**
+         * Gets the next part of reply initially set by HandleCommandComplete().
+         * Length of aNextReply must be equal or less than KDefaultCmdBufLength.
+         *
+         * @since S60 5.0
+         * @param aNextReply Next reply
+         * @return Symbian error code on error, KErrNone otherwise
+         */
+        TInt GetNextPartOfReply( RBuf8& aNextReply ) ;
+
+        /**
+         * Receives unsolicited results. Cancelling of the pending request is done
+         * by ReceiveUnsolicitedResultCancel(). The implementation in the extension
+         * plugin should be asynchronous.
+         *
+         * @since S60 5.0
+         * @return None
+         */
+        void ReceiveUnsolicitedResult();
+
+        /**
+         * Cancels a pending ReceiveUnsolicitedResult request.
+         *
+         * @since S60 5.0
+         * @return None
+         */
+        void ReceiveUnsolicitedResultCancel();
+
+        /**
+         * Reports NVRAM status change to the plugins.
+         *
+         * @since S60 5.0
+         * @param aNvram New NVRAM status. Each call of this function is a result
+         *               of DUN extracting the form notified by
+         *               CATExtCommonBase::SendNvramStatusChange(). Each of the
+         *               settings from SendNvramStatusChange() is separated to
+         *               one call of ReportNvramStatusChange().
+         * @return None
+         */
+        void ReportNvramStatusChange( const TDesC8& aNvram );
+
+        /**
+         * Reports about external handle command error condition.
+         * This is for cases when for example DUN decided the reply contained an
+         * error condition but the plugin is still handling the command internally.
+         * Example: in command line "AT+TEST;ATDT1234" was given. "AT+TEST" returns
+         * "OK" and "ATDT" returns "CONNECT". Because "OK" and "CONNECT" are
+         * different reply types the condition is "ERROR" and DUN ends processing.
+         * This solution keeps the pointer to the last AT command handling plugin
+         * inside ATEXT and calls this function there to report the error.
+         * It is to be noted that HandleCommandCancel() is not sufficient to stop
+         * the processing as the command handling has already finished.
+         *
+         * @since S60 5.0
+         * @return None
+         */
+        void ReportExternalHandleCommandError();
+
+
+        
+        enum TPluginStatus
+            {
+            ECmdCkpd,
+            ECmdCbklt,
+            EKeepAlive
+            };
+            
+        enum TLightStatus
+            {
+            ELightUninitialized = -1,
+            ELightOff = 0,
+            ELightOnWithDuration,
+            ELightOn
+            };
+
+    private: // From base classes
+
+        // @see CCFActionPlugIn
+        void HandleCommand( const TDesC8& aCmd, RBuf8& aReply, TBool aReplyNeeded );
+
+        // @see CCFActionPlugIn
+        TBool IsCommandSupported( const TDesC8& aCmd );
+
+    private: // New implementation
+
+        /**
+        * AT commands handling
+        * @param aCmd
+        * @param aReply
+        */
+        void HandleCommandL( const TDesC8& aCmd );                          
+
+
+    private: // CATCmdTimer
+		/**
+        * CATCmdTimer
+        */
+	    class CATCmdTimer
+	        : public CTimer
+		    {
+	        public: // Constructor, destructor
+		        /**
+                * Constructor
+                */
+		        CATCmdTimer( MATCmdTimer& aObserver, TInt aRelatedCommand );
+
+		        /**
+                * 2nd phase constructor
+                */
+		        void ConstructL();
+
+	        public: // from CActive
+		        /**
+                * Timer callback
+                */
+		        virtual void RunL();
+		        
+		    private: // data
+		        /** */
+		        MATCmdTimer& iObserver;
+		        TInt iRelatedCommand;
+		    };
+    
+    private: // from MATCmdTimer
+        void TimerExpiredL( TInt aRelatedCommand );
+        
+    private:
+        void LoadResourcesL();
+
+        void HandleCkpdCommandL( const TDesC8& aCmd );
+        
+        void HandleCbkltCommandL( const TDesC8& aCmd );
+        void HandleCtsaCommandL( const TDesC8& aCmd );
+
+        void ParseParametersL( const TDesC8& aCmd, 
+                               TInt& aStrokeTime, 
+                               TInt& aStrokeDelay );
+
+        void SendKeyL();
+
+        void SendNextKeyL();
+
+        void SimulateRawEventL( TKeyEvent& aKey, TEventCode aEvent  );
+        
+        void EnableBackLight();
+        
+        void DisableBackLight();
+        
+    private:
+		/**
+        * @param aCmd
+        */
+        //void ATCmdPNDRecv( CATCommand& aCmd );
+
+    private: // Constructors
+        /**
+        * C++ Constructor
+        */
+        CATCmdPluginEcom();
+
+        /**
+        * Symbian 2nd phase constructor
+        */
+        void ConstructL();
+
+    private: // Data
+        /** Owns: */
+        CArrayFix<TATCkpdCmd>* iCkpdCmdArray;
+
+        /** Owns: */
+        CATCmdTimer* iKpdTimer;
+        
+        CATCmdTimer* iBkltTimer;
+        
+        CATCmdTimer* iKeepAliveTimer;
+        
+        /** Owns: */
+        CArrayPtr<CATCmdTranslation>* iTranslations;
+
+        TEventCode iLastEvent;
+        
+        /** Owns: */
+        CHWRMLight* iLight;
+        
+        RWsSession iWsSession;
+        
+        TPluginStatus iCmdReceived;
+        
+        TLightStatus iLightStatus;
+        
+        TInt iDuration;
+        
+        RBuf8* iReplyBuf;
+    };
+
+#endif // __ATCMDPLUGINECOM_H
+
+// End of File
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/ATCmdPlugin/inc/atcmdplugin.rh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/ATCmdPlugin/inc/atcmdplugin.rh	Fri Apr 16 15:08:06 2010 +0300
@@ -0,0 +1,36 @@
+
+/*
+ * Copyright (c) 2008-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 :Resource structure definitions for ATCmdplugin
+ *
+ */
+
+#ifndef __AVKON_HRH__
+#include <avkon.hrh>
+#endif
+
+#if !defined(__BADEF_RH__)
+#include <BADEF.RH>
+#endif
+
+#if !defined(__UIKON_HRH__)
+#include <uikon.hrh>
+#endif
+
+
+STRUCT ATCMDPLUGIN_TRANSLATION
+	{
+    LONG code = 0;
+	LTEXT8 text;
+	}
+
+// End Of File
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/ATCmdPlugin/inc/atcmdpluginuids.hrh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/ATCmdPlugin/inc/atcmdpluginuids.hrh	Fri Apr 16 15:08:06 2010 +0300
@@ -0,0 +1,30 @@
+
+/*
+ * Copyright (c) 2008-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: Collection of uid's
+ *
+ */
+
+#ifndef __ATCMDPLUGINUIDS_HRH
+#define __ATCMDPLUGINUIDS_HRH
+
+
+// INCLUDES
+#define KUidATCmdEcomDll   0x2001A273
+#define KUidATCmdEcomImpl1 0x2001A274
+#define KUidT_ATCmdExe     0x2001A275
+// Reserved 0x2001A276
+
+    
+#endif // __ATCMDPLUGINUIDS_HRH
+
+// End of File
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/ATCmdPlugin/inc/debug.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/ATCmdPlugin/inc/debug.h	Fri Apr 16 15:08:06 2010 +0300
@@ -0,0 +1,227 @@
+
+/*
+ * Copyright (c) 2008-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 :tracing and debuging definitions.
+ *
+ */
+
+
+#ifndef DEBUGTRACE_H
+#define DEBUGTRACE_H
+
+#include <e32base.h>
+#include <e32svr.h>
+
+#ifdef _DEBUG
+
+#include <flogger.h>
+
+_LIT(KLogFile,"atcmdplugin.txt");
+_LIT(KLogDir,"atcmdplugin");
+_LIT(KATDebugFile, "log.txt" );
+_LIT(KATDebugDir, "atcmdplugin" );
+
+_LIT(KTracePrefix16, "[ATCmdPlugin] ");
+_LIT8(KTracePrefix8, "[ATCmdPlugin] ");
+_LIT8(KFuncFormat8, ">< %S");
+_LIT8(KFuncThisFormat8, ">< %S, [0x%08X]");
+_LIT8(KFuncEntryFormat8, "-> %S");
+_LIT8(KFuncEntryThisFormat8, "-> %S, [0x%08X]");
+_LIT8(KFuncEntryArgFormat8, "-> %S, (%S)");
+_LIT8(KFuncExitFormat8, "<- %S");
+_LIT(KPanicCategory, "ATCmdPlugin");
+_LIT8(KPanicPrefix8, "PANIC code ");
+_LIT8(KLeavePrefix8, "LEAVE code ");
+
+const TInt KMaxLogLineLength = 256;
+
+// Trace options
+#define KPRINTERROR		0x00000001 // Print error
+#define KPRINTINFO	    0x00000002 // Print function trace
+#define KPRINTSTATE		0x00000004 // Print state machine infos
+#define KPRINTWARNING  0x00000008 // Print warnings
+
+//#define USE_FILE_LOGGING
+
+const TInt KTraceMask = KPRINTERROR | KPRINTINFO | KPRINTSTATE | KPRINTWARNING;
+
+NONSHARABLE_CLASS(TOverflowTruncate16) : public TDes16Overflow
+	{
+public:
+	void Overflow(TDes16& /*aDes*/) {}
+	};
+
+NONSHARABLE_CLASS(TOverflowTruncate8) : public TDes8Overflow
+	{
+public:
+	void Overflow(TDes8& /*aDes*/) {}
+	};
+
+inline void Trace(TRefByValue<const TDesC16> aFmt, ...)
+    {
+	VA_LIST list;
+	VA_START(list,aFmt);
+    RBuf16 buf;
+    buf.Create(KMaxLogLineLength);
+    buf.Zero();    
+	buf.Append(KTracePrefix16);
+	TOverflowTruncate16 overflow;
+	buf.AppendFormatList(aFmt,list,&overflow);
+	RDebug::Print(buf);
+#ifdef USE_FILE_LOGGING
+    RFileLogger::Write(KLogDir, KLogFile, EFileLoggingModeAppend, buf);
+#endif
+	buf.Close();
+    }
+
+inline void Trace(TRefByValue<const TDesC8> aFmt, ...)
+    {
+    VA_LIST list;
+    VA_START(list, aFmt);
+	TOverflowTruncate8 overflow;
+    RBuf8 buf8;
+    buf8.Create(KMaxLogLineLength);
+    buf8.Zero();    
+    buf8.Append(KTracePrefix8);
+	buf8.AppendFormatList(aFmt, list, &overflow);
+    RDebug::RawPrint(buf8);
+#ifdef USE_FILE_LOGGING
+    RFileLogger::Write(KLogDir, KLogFile, EFileLoggingModeAppend, buf8);
+#endif
+    buf8.Close();
+    }
+
+inline void TracePanic(
+	char* aFile, 
+	TInt aLine,
+	TInt aPanicCode,
+	const TDesC& aPanicCategory)
+    {
+	TPtrC8 fullFileName((const TUint8*)aFile);
+	TPtrC8 fileName(fullFileName.Ptr()+fullFileName.LocateReverse('\\')+1);
+    RBuf8 buf;
+    buf.Create(KMaxLogLineLength);
+    buf.Zero();    
+	buf.Append(KPanicPrefix8);
+	buf.AppendFormat(_L8("%d at line %d in file %S"), aPanicCode, aLine, &fileName);
+	Trace(buf);
+	buf.Close();
+	User::Panic(aPanicCategory, aPanicCode); 
+    }
+
+inline void TraceLeave(char* aFile, TInt aLine, TInt aReason)
+	{
+	TPtrC8 fullFileName((const TUint8*)aFile);
+	TPtrC8 fileName(fullFileName.Ptr()+fullFileName.LocateReverse('\\')+1);
+    RBuf8 buf;
+    buf.Create(KMaxLogLineLength);
+    buf.Zero();    
+	buf.Append(KLeavePrefix8);
+	buf.AppendFormat(_L8("%d at line %d in file %S"), aReason, aLine, &fileName);
+	Trace(buf);
+	buf.Close();
+	User::LeaveIfError(aReason);
+	}
+
+inline TBuf8<64> ArgFormat(TRefByValue<const TDesC8> aFmt, ...)
+    {
+    TOverflowTruncate8 overflow;
+    TBuf8<64> buf8;
+    buf8.Format(aFmt, &overflow);
+    return buf8;
+    }
+
+#define TRACE_INFO(p) {if(KTraceMask & KPRINTINFO) Trace p;}
+
+#define TRACE_ERROR(p) {if(KTraceMask & KPRINTERROR) Trace p;}
+
+#define TRACE_STATE(p) {if(KTraceMask & KPRINTSTATE) Trace p;}
+
+#define TRACE_WARNING(p) {if(KTraceMask & KPRINTWARNING) Trace p;}
+
+#define TRACE_INFO_SEG(p) {if(KTraceMask & KPRINTINFO) p;}
+
+#define TRACE_ASSERT(GUARD, CODE) {if (!(GUARD)) \
+         TracePanic(__FILE__, __LINE__, CODE, KPanicCategory);}
+
+#define PANIC(CODE) TracePanic(__FILE__, __LINE__, CODE, KPanicCategory)
+
+#define LEAVE_IF_ERROR(REASON) {if (REASON) \
+         TraceLeave(__FILE__, __LINE__, REASON);}
+
+#define LEAVE(REASON) TraceLeave(__FILE__, __LINE__, REASON)
+
+#define TRACE_FUNC_ENTRY {if(KTraceMask & KPRINTINFO) { \
+                            TPtrC8 ptr8((TUint8*)__PRETTY_FUNCTION__); \
+                            Trace(KFuncEntryFormat8, &ptr8);}}
+
+#define TRACE_FUNC_ENTRY_THIS {if(KTraceMask & KPRINTINFO) {\
+                            TPtrC8 ptr8((TUint8*)__PRETTY_FUNCTION__); \
+                            Trace(KFuncEntryThisFormat8, &ptr8, this);}}
+
+#define	 TRACE_FUNC_EXIT {if(KTraceMask & KPRINTINFO) {\
+                            TPtrC8 ptr8((TUint8*)__PRETTY_FUNCTION__); \
+                            Trace(KFuncExitFormat8, &ptr8);}}
+
+#define TRACE_FUNC {if(KTraceMask & KPRINTINFO) { \
+                            TPtrC8 ptr8((TUint8*)__PRETTY_FUNCTION__); \
+                            Trace(KFuncFormat8, &ptr8);}}
+
+#define TRACE_FUNC_THIS {if(KTraceMask & KPRINTINFO) {\
+                            TPtrC8 ptr8((TUint8*)__PRETTY_FUNCTION__); \
+                            Trace(KFuncThisFormat8, &ptr8, this);}}
+
+#define TRACE_FUNC_ARG(a) { if(KTraceMask & KPRINTINFO) { \
+                            TPtrC8 func( (TUint8*) __PRETTY_FUNCTION__ ); \
+                            TPtrC8 arg( ArgFormat a ); \
+                            Trace( KFuncEntryArgFormat8, &func, &arg ); } }
+
+#define RETURN_IF_ERR(ERR) {if(ERR) {Trace(_L8(" RETURN %d at file %S line %d"), ERR, &(TPtrC8((const TUint8*)__FILE__)), __LINE__); return ERR;}}
+
+#else // ! _DEBUG
+
+#define TRACE_INFO(p)
+
+#define TRACE_ERROR(p)
+
+#define TRACE_STATE(p)
+
+#define TRACE_WARNING(p)
+
+#define TRACE_INFO_SEG(p)
+
+#define TRACE_ASSERT(GUARD, CODE)
+
+#define PANIC(CODE) {User::Panic(KPanicCategory, CODE);}
+
+#define LEAVE_IF_ERROR(REASON) {static_cast<void>(User::LeaveIfError(REASON));}
+
+#define LEAVE(REASON) {static_cast<void>(User::Leave(REASON));}
+
+#define TRACE_FUNC_ENTRY
+
+#define TRACE_FUNC_ENTRY_THIS
+
+#define TRACE_FUNC_EXIT
+
+#define TRACE_FUNC
+
+#define TRACE_FUNC_THIS
+
+#define TRACE_FUNC_ARG(a)
+
+#define RETURN_IF_ERR(ERR) {if(ERR) return ERR;}
+#endif // _DEBUG
+
+#endif // DEBUGTRACE_H
+
+// End of File
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/ATCmdPlugin/inc/matcmdtimer.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/ATCmdPlugin/inc/matcmdtimer.h	Fri Apr 16 15:08:06 2010 +0300
@@ -0,0 +1,38 @@
+
+/*
+ * Copyright (c) 2008-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 :Abstract interface for MATCmdTimer callback functionality
+ *
+ */
+
+
+
+#ifndef __MATCMDTIMER_H
+#define __MATCMDTIMER_H
+
+// INCLUDES
+#include <e32std.h>
+
+// FORWARD DECLARATIONS
+
+// CLASS DECLARATION
+
+class MATCmdTimer
+    {
+    public:
+        virtual void TimerExpiredL( TInt aRelatedCommand ) = 0;
+    };
+
+#endif // __MATCMDTIMER_H
+
+            
+// End of File
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/ATCmdPlugin/readme.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/ATCmdPlugin/readme.txt	Fri Apr 16 15:08:06 2010 +0300
@@ -0,0 +1,4 @@
+- AT Command plugin implements AT commands for AT+CKPD, AT+CBKLT, AT+CTSA
+- This plugin will not be part of SF and will be moved to ext folder later
+- To test this plugin we need to manually build 
+- Optionally, after building we can generate a sisx file and use it for testing. Look at ATCmdPlugin\sis folder for information
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/ATCmdPlugin/rom/atcmdplugin.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/ATCmdPlugin/rom/atcmdplugin.iby	Fri Apr 16 15:08:06 2010 +0300
@@ -0,0 +1,30 @@
+
+/*
+ * Copyright (c) 2008-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 :Contains information about binary files and binary file locations
+ *
+ */
+
+#ifndef __ATCMDPLUGIN_IBY
+#define __ATCMDPLUGIN_IBY
+
+//#ifdef FF_ATNT_AT_COMMANDS
+
+// The above line ifdef is commented,Because FF_ATNT_AT_COMMANDSis going to be replaced with new macro.
+ECOM_PLUGIN(atcmdplugin.dll, atcmdplugin.rsc)
+S60_APP_RESOURCE(atcmdpluginresource)
+
+//#endif
+
+#endif // __ATCMDPLUGIN_IBY
+
+// End of File
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/ATCmdPlugin/sis/atcmdplugin.pkg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/ATCmdPlugin/sis/atcmdplugin.pkg	Fri Apr 16 15:08:06 2010 +0300
@@ -0,0 +1,37 @@
+;
+; 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: 
+;
+; ExtAtCmdHandler.pkg
+;
+;Language - standard language definitions
+&EN
+
+;Standard SIS file header (use UI application UID)
+#{"ATCmdPlugin"},(0x2001A273),1,0,0
+
+;Supports Series 60 v 3.0
+[0x1028315F], 0, 0, 0, {"Series60ProductID"}
+
+;Localised Vendor name
+%{"Nokia"}
+
+;Unique Vendor name
+:"Nokia"
+
+;Files to install
+"\epoc32\release\armv5\urel\atcmdplugin.dll"      -"!:\sys\bin\atcmdplugin.dll"
+"\epoc32\data\z\resource\plugins\atcmdplugin.rsc"   -"!:\resource\plugins\atcmdplugin.rsc"
+"\epoc32\data\z\resource\apps\atcmdpluginresource.rsc"         -"!:\resource\apps\atcmdpluginresource.rsc"
+
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/ATCmdPlugin/sis/atcmdplugin.sis
Binary file coreapplicationuis/ATCmdPlugin/sis/atcmdplugin.sis has changed
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/ATCmdPlugin/sis/atcmdplugin.sisx
Binary file coreapplicationuis/ATCmdPlugin/sis/atcmdplugin.sisx has changed
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/ATCmdPlugin/src/atcmd.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/ATCmdPlugin/src/atcmd.cpp	Fri Apr 16 15:08:06 2010 +0300
@@ -0,0 +1,50 @@
+
+/*
+ * Copyright (c) 2008-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 :
+ *
+ */
+
+
+
+// INCLUDES
+#include "debug.h"
+#include "atcmd.h"
+
+// CONSTANTS
+
+// ============================= LOCAL FUNCTIONS  =============================
+
+// ============================= MEMBER FUNCTIONS =============================
+
+CATCmdTranslation::CATCmdTranslation( HBufC8& aParam, const TInt aCode )
+    : iParam( &aParam ),
+      iCode( aCode )
+    {
+    }
+
+CATCmdTranslation::~CATCmdTranslation()
+    {
+    delete iParam;
+    }
+
+TInt CATCmdTranslation::Code() const
+    {
+    return iCode;
+    }
+
+TPtrC8 CATCmdTranslation::Param() const
+    {
+    return iParam->Des();
+    }
+
+//  End of File  
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/ATCmdPlugin/src/atcmdplugin.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/ATCmdPlugin/src/atcmdplugin.cpp	Fri Apr 16 15:08:06 2010 +0300
@@ -0,0 +1,1067 @@
+
+/*
+ * Copyright (c) 2008-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 :
+ *
+ */
+
+
+
+// INCLUDES
+#include <hwrmlightdomaincrkeys.h>
+#include <coreapplicationuisdomainpskeys.h>
+#include <hal.h>
+#include <atcmdpluginresource.rsg>
+#include <barsread.h>
+#include <barsc.h>
+#include <bautils.h>
+#include <e32math.h>
+#include <e32base.h>
+#include <eikenv.h>
+#include <apgtask.h>
+#include "debug.h"
+#include "atcmdplugin.h"
+
+// CONSTANTS
+_LIT8( KAtCkpd, "+CKPD" );
+_LIT8( KAtCbklt, "+CBKLT" );
+_LIT8( KCRLF, "\r\n" );
+_LIT8( KAtCtsa, "+CTSA");
+
+const TInt KCustomKeyCodeIdentifier = -1;
+const TInt KGranularity = 10;
+const TInt KTimeMultiplier = 100000;
+const TInt KMicroSeconds = 1000000;
+
+#define REPLY_BUFFER_SIZE 200
+
+// These values are based on testing results.
+// Values less than 2000 causes some times missing key events
+// even all keys are simulated with long commands.
+const TInt KDefaultStrokeDelay = 50000;
+const TInt KDefaultStrokeTime = 10000;
+
+const TInt KLightTarget = CHWRMLight::EPrimaryDisplayAndKeyboard;
+
+_LIT8( KParameterSeparator, "," );
+_LIT8( Kok, "\r\nOK\r\n");
+_LIT8( KCmeErrorNotSupported, "\r\n+CME ERROR: 4\r\n");
+_LIT8( KTestCommand, "=?" );
+_LIT8( KReadCommand, "?" );
+_LIT8( KCbkltTestCommandResp, ":(0,1,2)" );
+_LIT8( KCkpdTestCommandResp,  ":(GSM)" );
+_LIT8( KCtsaTestCommandResp, ":(0,1,2),(width),(height)" );
+_LIT( KFileName, "\\resource\\apps\\atcmdpluginresource.rsc" );
+
+
+// ============================= MEMBER FUNCTIONS =============================
+
+// ----------------------------------------------------------------------------
+// CATCmdPluginEcom::NewL
+// 2-phased constructor
+// (may leave)
+// ----------------------------------------------------------------------------
+//
+CATCmdPluginEcom* CATCmdPluginEcom::NewL()
+    {
+    CATCmdPluginEcom* self = new (ELeave) CATCmdPluginEcom();
+    CleanupStack::PushL( self );
+    self->ConstructL();
+    CleanupStack::Pop( self );
+
+    return self;
+    }
+
+// ----------------------------------------------------------------------------
+// CATCmdPluginEcom::CATCmdPluginEcom
+// Constructor
+// ----------------------------------------------------------------------------
+//
+CATCmdPluginEcom::CATCmdPluginEcom() 
+    : CATExtPluginBase()
+    {
+    TRACE_FUNC
+    }
+     
+// ----------------------------------------------------------------------------
+// CATCmdPluginEcom::ConstructL
+// Constructor
+// (may leave)
+// ----------------------------------------------------------------------------
+//
+void CATCmdPluginEcom::ConstructL()
+    {
+    TRACE_FUNC
+	
+    LEAVE_IF_ERROR( iWsSession.Connect() );
+    iCkpdCmdArray = new (ELeave) CArrayFixFlat<TATCkpdCmd>( KGranularity );
+    
+    iKpdTimer = new ( ELeave ) CATCmdTimer( *this, ECmdCkpd );
+	iKpdTimer->ConstructL();
+	
+    iBkltTimer = new ( ELeave ) CATCmdTimer( *this, ECmdCbklt );
+    iBkltTimer->ConstructL();
+    
+    iKeepAliveTimer = new ( ELeave ) CATCmdTimer( *this, EKeepAlive );
+    iKeepAliveTimer->ConstructL();
+
+	
+    LoadResourcesL();
+   	}
+
+// ----------------------------------------------------------------------------
+// CATCmdPluginEcom::::LoadResourcesL
+// Load resources
+// (may leave)
+// Status : Approved
+// ----------------------------------------------------------------------------
+//
+void CATCmdPluginEcom::LoadResourcesL()
+    {
+    TRACE_FUNC_ENTRY
+
+    RFs fs;
+    CleanupClosePushL( fs );
+
+    TFileName fileName;
+    fileName.Copy( KFileName );
+    User::LeaveIfError( fs.Connect() );
+    BaflUtils::NearestLanguageFile( fs, fileName );
+
+    RResourceFile resourceFile;
+    CleanupClosePushL( resourceFile );
+    resourceFile.OpenL( fs, fileName );
+    resourceFile.ConfirmSignatureL();
+
+    HBufC8* buf8 = resourceFile.AllocReadLC( R_ATCMDPLUGIN_TRANSLATIONTABLE );
+    
+    TResourceReader reader;
+    reader.SetBuffer( buf8 );
+    
+    TInt count = reader.ReadInt16(); // array count
+    iTranslations = new ( ELeave ) CArrayPtrFlat<CATCmdTranslation>( count );
+
+    while ( count-- )
+        {
+        const TInt code = reader.ReadInt32(); 
+
+        HBufC8* param = reader.ReadHBufC8L(); 
+        CleanupStack::PushL( param );
+        CATCmdTranslation* t = new (ELeave) CATCmdTranslation( *param, code );
+        CleanupStack::Pop( param ); // transfer ownership
+
+        CleanupStack::PushL( t );
+        iTranslations->AppendL( t );
+        CleanupStack::Pop( t ); // transfer ownership
+        }
+
+    CleanupStack::PopAndDestroy( 3 ); // resourceFile, fs, buf8
+
+    TRACE_FUNC_EXIT
+    }
+
+
+// ----------------------------------------------------------------------------
+// CATCmdPluginEcom::~CATCmdPluginEcom
+// C++ Destructor
+// ----------------------------------------------------------------------------
+//
+CATCmdPluginEcom::~CATCmdPluginEcom()
+	{
+	TRACE_FUNC
+	
+    if(iKpdTimer)
+        {
+        iKpdTimer->Cancel();
+        delete iKpdTimer;
+        }	    
+    if(iBkltTimer)
+        {
+        iBkltTimer->Cancel();
+        delete iBkltTimer;
+        }
+    if(iKeepAliveTimer)
+        {
+        iKeepAliveTimer->Cancel();
+        delete iKeepAliveTimer;
+        }
+    if ( iTranslations)
+        {
+        iTranslations->ResetAndDestroy();
+        delete iTranslations;
+        }    
+    if ( iCkpdCmdArray)
+        {
+        iCkpdCmdArray->Reset();
+        delete iCkpdCmdArray;
+        }
+    iWsSession.Close();
+	}
+
+
+// ----------------------------------------------------------------------------
+// CATCmdPluginEcom::HandleCommand
+// Handle given command
+// ----------------------------------------------------------------------------
+//
+void CATCmdPluginEcom::HandleCommand( const TDesC8& aCmd, RBuf8& aReply, TBool /* aReplyNeeded  */)
+	{
+	TRACE_FUNC_ENTRY
+	aReply.Create(REPLY_BUFFER_SIZE);
+	aReply.Zero();
+	iReplyBuf = &aReply;
+	
+	if ( IsCommandSupported( aCmd ) )
+	    {
+	    	
+		TRAPD( err, HandleCommandL( aCmd ) );
+
+		if ( err )
+			{
+			iReplyBuf->Append( KCmeErrorNotSupported ); 
+			}
+		else
+			{
+			if(iReplyBuf->Length() == 0)
+				{
+				iReplyBuf->Append( Kok );
+				} 
+			}
+		HandleCommandCompleted( KErrNone,EReplyTypeOk );      
+		}
+    TRACE_FUNC_EXIT
+    }
+
+// ----------------------------------------------------------------------------
+// CATCmdPluginEcom::HandleCommandL
+// Handle given command
+// (may leave)
+// ----------------------------------------------------------------------------
+//
+void CATCmdPluginEcom::HandleCommandL( const TDesC8& aCmd )
+	{
+    // Verify command
+    TInt offset;
+    HBufC8* cmd = aCmd.AllocLC();
+//    CleanupStack:: PushL(cmd);
+    TPtr8 ptr = cmd->Des();
+
+    ptr.Trim();
+    TPtrC8 cptr;
+
+    if ( ( offset = ptr.FindF(KAtCkpd) ) >= 0 )
+        {
+        cptr.Set( ptr.Mid( offset + KAtCkpd().Length() ) );         
+        HandleCkpdCommandL( cptr );
+        }
+    else if ( ( offset = ptr.FindF(KAtCbklt) ) >= 0 ) 
+        {
+        cptr.Set( ptr.Mid( offset + KAtCbklt().Length() ) );
+        HandleCbkltCommandL( cptr );
+        }
+    else if ( ( offset = ptr.FindF(KAtCtsa) ) >= 0 )
+    	{
+    	cptr.Set( ptr.Mid( offset + KAtCtsa().Length() ) );
+    	HandleCtsaCommandL( cptr );
+    	} 
+    CleanupStack::PopAndDestroy( cmd );
+    }    
+
+// -------------------------
+//  HandleCtsaCommandL
+//
+// -------------------------
+
+void CATCmdPluginEcom::HandleCtsaCommandL( const TDesC8& aCmd )
+    {
+    
+    if ( aCmd.Compare( KTestCommand ) == 0 )
+        {
+        // Test command just returns "OK"        
+        iReplyBuf->Append( KCRLF );
+        iReplyBuf->Append( KAtCtsa );
+        iReplyBuf->Append( KCtsaTestCommandResp );
+        iReplyBuf->Append( KCRLF );
+        TRACE_FUNC_EXIT
+        return;
+        }  
+    
+    // Check boundary condition
+	if ( ( aCmd.Length() < 6 ) || ( aCmd[2] !=  ',' ))
+	    {
+	    // Command Syntax Error
+	    User::Leave( KErrNotSupported );           
+	    } 	
+ 	TInt   pos=0;
+ 	TInt8  actionValue = aCmd[1] - '0';
+ 	TInt16 xCoordinateValue = 0;
+ 	TInt16 yCoordinateValue = 0;
+ 	TInt16 commandLen = aCmd.Length();  
+ 	 
+ 	
+ 	if( actionValue < 0 || actionValue > 4 )
+ 	    {
+ 	    // Command Syntax Error          
+ 	    User::Leave( KErrNotSupported );                  
+ 	    }
+ 	
+ 	pos=3;  // X Cordinate starts from 3d character
+ 	
+ 	CWsScreenDevice *scrnDevPointer = new(ELeave) CWsScreenDevice(iWsSession);
+ 	TSize coordinateSize;
+ 	
+	scrnDevPointer->Construct();
+ 	coordinateSize = scrnDevPointer->SizeInPixels();  
+ 	delete scrnDevPointer;
+ 	
+	while(pos < commandLen)
+ 	    {
+ 	    if((aCmd[pos] >=  '0') && (aCmd[pos] <=  '9'))
+ 	        {
+ 	        xCoordinateValue *= 10;
+ 	        xCoordinateValue += aCmd[pos] - '0';
+ 	        pos++;
+ 	        if(xCoordinateValue > coordinateSize.iWidth )
+ 	            {
+ 	            // Command Syntax Error            
+ 	            User::Leave( KErrNotSupported );           
+ 	            }
+ 	        }
+ 	    else if((aCmd[pos] ==  ',') && pos > 3 )
+            {
+            pos++;
+            break;
+            }
+ 	    else
+ 	        {
+ 	        // Command Syntax Error            
+ 	        User::Leave( KErrNotSupported );             
+ 	        } 	    
+ 	    }
+	if(pos == commandLen)	
+		{
+		// Command of type =0,100        /* Command Syntax Error */
+ 	    User::Leave( KErrNotSupported );  
+		}
+ 	while(pos < commandLen)
+ 	    {
+ 	    if((aCmd[pos] >=  '0') && (aCmd[pos] <=  '9'))
+ 	        {
+ 	        yCoordinateValue *= 10;
+ 	        yCoordinateValue += aCmd[pos] - '0';
+ 	        pos++;
+			if(yCoordinateValue > coordinateSize.iHeight)
+ 	            {
+ 	            // Command Syntax Error            
+ 	            User::Leave( KErrNotSupported );           
+ 	            }
+ 	        }
+ 	    else
+ 	        {
+ 	        // Command Syntax Error            
+ 	        User::Leave( KErrNotSupported );             
+ 	        }       
+ 	    }
+ 	
+ 	TRawEvent rawEvent;
+	switch(actionValue)
+		{
+		case 0:  // Release pointer event
+		    {
+			rawEvent.Set( TRawEvent::EButton1Up, xCoordinateValue, yCoordinateValue);
+			iWsSession.SimulateRawEvent(rawEvent);
+			iWsSession.Flush();
+			break;
+			}
+		case 1:   // Depress pointer event
+			{
+			rawEvent.Set( TRawEvent::EButton1Down, xCoordinateValue, yCoordinateValue);
+			iWsSession.SimulateRawEvent(rawEvent);
+			iWsSession.Flush();
+			break;
+			}
+		case 2:   // Single tap pointer event
+			{
+			rawEvent.Set( TRawEvent::EButton1Down, xCoordinateValue, yCoordinateValue);
+			iWsSession.SimulateRawEvent(rawEvent);
+			rawEvent.Set( TRawEvent::EButton1Up, xCoordinateValue+1, yCoordinateValue+1);
+			iWsSession.SimulateRawEvent(rawEvent);
+			iWsSession.Flush();
+			break;
+			}
+		case 3:   // Double tap pointer event
+			{
+			rawEvent.Set( TRawEvent::EButton1Down, xCoordinateValue, yCoordinateValue);
+			iWsSession.SimulateRawEvent(rawEvent);
+			rawEvent.Set( TRawEvent::EButton1Up, xCoordinateValue+1, yCoordinateValue+1);
+			iWsSession.SimulateRawEvent(rawEvent);
+			rawEvent.Set( TRawEvent::EButton1Down, xCoordinateValue, yCoordinateValue);
+			iWsSession.SimulateRawEvent(rawEvent);
+			rawEvent.Set( TRawEvent::EButton1Up, xCoordinateValue+1, yCoordinateValue+1);
+			iWsSession.SimulateRawEvent(rawEvent);
+			iWsSession.Flush();
+			break;
+			}
+		}
+	}     
+    
+
+// ----------------------------------------------------------------------------
+// CATCmdPluginEcom::HandleCkpdCommandL
+// Handle CKPD command
+// (may leave)
+// ----------------------------------------------------------------------------
+//
+void CATCmdPluginEcom::HandleCkpdCommandL( const TDesC8& aCmd )
+    {
+    TRACE_FUNC_ENTRY
+    TBool commandVerified(EFalse);
+    TInt strokeTime = 0;
+    TInt strokeDelay = 0;
+    
+    if ( aCmd.Compare( KTestCommand ) == 0 )
+        {
+        iReplyBuf->Append( KCRLF );
+        iReplyBuf->Append( KAtCkpd );
+        iReplyBuf->Append( KCkpdTestCommandResp );
+        iReplyBuf->Append( KCRLF );
+        TRACE_FUNC_EXIT
+        return;
+        }
+
+    CArrayFix<TATCkpdCmd>* ckpdCmds = 
+        new (ELeave) CArrayFixFlat<TATCkpdCmd>( KGranularity );
+    CleanupStack::PushL( ckpdCmds );
+    
+    // Check that keys are defined
+    if (  aCmd.Length() <= 1  )
+        {
+        // Command Syntax Error          
+        User::Leave( KErrNotSupported );           
+        }
+
+    // Go through keys
+    TBuf8<2> key;
+    for (TInt i = 1 ; i < aCmd.Length(); i++ )
+        {
+        key.Copy(&aCmd[i],1);
+
+        // Go through translation table for every character
+        for ( TInt j = 0; j < iTranslations->Count(); j++ )
+            {
+            CATCmdTranslation& translation = *iTranslations->At( j );
+            if ( key.CompareF( translation.Param() ) == 0 )
+                {
+                // Check if key is escape character for manufacturer specific keys
+                if ( translation.Code() == KCustomKeyCodeIdentifier )
+                    {
+                    // Read next key to form key combination
+                    i++;
+                    
+                    // Check that there are key after escape character
+                    if ( i >= aCmd.Length() )
+                        {
+                        TRACE_INFO(( _L( "INFO: invalid manufacturer specific key" ) ))            
+                        // Not handled
+                        User::Leave( KErrNotSupported );           
+                        }
+
+                    if ( key.Length() < key.MaxLength() )
+                        {
+                        key.Append(aCmd[i]);
+                        }
+
+                    // Start looping again for looking keycombination
+                    // from translation table
+                    j = 0;
+                    }
+                else
+                    {
+                    // Command verified
+                    commandVerified = ETrue;
+
+                    if ( translation.Code() != EKeyNull )
+                        {
+                        TATCkpdCmd cmd;
+                        cmd.iCode = translation.Code();
+                        ckpdCmds->AppendL( cmd );
+                        }
+
+                    break;
+                    }
+                }
+            }
+
+        if (!commandVerified)
+            {
+            // Check if character is parameter separator
+            if ( key.Compare( KParameterSeparator ) == 0 )
+                {
+                i++;
+
+                if ( i > aCmd.Length() )
+                    {
+                    TRACE_ERROR(( _L( "ERROR: invalid stroke time parameter" ) ))
+
+                    // Not handled
+                    User::Leave( KErrNotSupported );
+                    }
+
+                ParseParametersL(
+                        aCmd.Right(aCmd.Length()-i),
+                        strokeTime,
+                        strokeDelay);
+
+                strokeTime *= KTimeMultiplier;
+                strokeDelay *= KTimeMultiplier;
+                
+                break;
+                }
+            else
+                {
+                TRACE_ERROR(( _L8( "ERROR: Command %S not supported" ), &key ))
+
+                // Not handled
+                User::Leave( KErrNotSupported );
+                }
+            }
+
+        commandVerified = EFalse;
+        }
+
+    // Set default stroke time and delay if those are not set with parameters or
+    // parameter value have been zero. If values are not greater than ~2ms there
+    // is possibility to loose key events with long commands even all keys are
+    // simulated by atcmdplugin
+    if ( !strokeTime )
+        {
+        strokeTime = KDefaultStrokeTime;
+        }
+
+    if ( !strokeDelay )
+        {
+        strokeDelay = KDefaultStrokeDelay;
+        }
+
+    // Append commands to command array
+    for ( TInt count = 0; count < ckpdCmds->Count(); count++ )
+        {
+        TATCkpdCmd cmd = ckpdCmds->At(count);
+        cmd.iStrokeTime = strokeTime;
+        cmd.iStrokeDelay = strokeDelay;
+        
+        iCkpdCmdArray->AppendL( cmd );
+        }
+
+    CleanupStack::PopAndDestroy(ckpdCmds);
+
+    SendKeyL();
+    
+    TRACE_FUNC_EXIT
+    }
+
+// ----------------------------------------------------------------------------
+// CATCmdPluginEcom::HandleCbkltCommandL
+// Handle CKPD command
+// (may leave)
+// ----------------------------------------------------------------------------
+//
+void CATCmdPluginEcom::HandleCbkltCommandL( const TDesC8& aCmd )
+    {
+    TRACE_FUNC_ENTRY
+
+         
+    if ( aCmd.Compare( KTestCommand ) == 0 )
+        {
+        iReplyBuf->Append( KCRLF );
+        iReplyBuf->Append( KAtCbklt );
+        iReplyBuf->Append( KCbkltTestCommandResp );
+        iReplyBuf->Append( KCRLF );
+        TRACE_FUNC_EXIT
+        return;
+        }
+		
+	if(iLightStatus != ELightOnWithDuration)
+		{
+		iLight = CHWRMLight::NewL( this );
+	
+		iLightStatus = 
+			( iLight->LightStatus( KLightTarget ) == CHWRMLight::ELightOff )?
+			ELightOff : ELightOn;   
+		delete iLight;		
+		}
+
+    if ( aCmd.Compare( KReadCommand ) == 0 )
+        {
+        iReplyBuf->Append( KCRLF );
+        iReplyBuf->Append( KAtCbklt );
+        iReplyBuf->Append( ':' );
+        iReplyBuf->Append( ' ' );
+        iReplyBuf->AppendNum( iLightStatus );
+        if ( iLightStatus == ELightOnWithDuration )
+            {
+            iReplyBuf->Append( ',' );
+            iReplyBuf->AppendNum( iDuration );
+            }
+        iReplyBuf->Append( KCRLF );
+        TRACE_FUNC_EXIT
+        return;
+        }
+
+    if ( aCmd.Length() <= 1 )
+        {
+        // Command Syntax Error        
+        User::Leave( KErrNotSupported );
+        }
+
+    switch ( aCmd[ 1 ] )
+        {
+        case '0':
+            {
+            if ( aCmd.Length() == 2 )
+                {
+                iKeepAliveTimer->Cancel();
+                DisableBackLight();
+                iLightStatus = ELightOff;
+                }
+            else
+                {
+                //if the command is too long it means that is incorrect
+                User::Leave( KErrNotSupported );
+                }
+            break;
+            }
+        case '1':
+            {
+            if ( ( aCmd.Length() > 3 ) && ( aCmd[ 2 ] == ',' ) )
+                {                
+                TInt pos = 3;
+                TInt commandLen = aCmd.Length();
+                iDuration = 0;
+                while(pos < commandLen)
+                        {
+                        if((aCmd[pos] >=  '0') && (aCmd[pos] <=  '9'))
+                            {
+                            iDuration *= 10;
+                            iDuration += aCmd[pos] - '0';
+                            pos++;
+                            }
+                        else
+                            {
+                            User::Leave( KErrNotSupported );             
+                            }
+                        }
+                iBkltTimer->Cancel();
+                iBkltTimer->After( iDuration * KMicroSeconds );
+                EnableBackLight();
+                if ( !iKeepAliveTimer->IsActive() )
+                     {
+                     iKeepAliveTimer->After( 2000000 );
+                     }
+                iLightStatus = ELightOnWithDuration;
+                }
+            else
+                {
+                //the command is wrong
+                User::Leave( KErrNotSupported );
+                }
+            break;
+            }
+        case '2':
+            {
+            if ( aCmd.Length() == 2 )
+                {
+                iBkltTimer->Cancel();
+                EnableBackLight();
+                if ( !iKeepAliveTimer->IsActive() )
+                    {
+                    iKeepAliveTimer->After( 2000000 );
+                    }
+                iLightStatus = ELightOn;
+                }
+            else
+                {
+                //if the command is too long it means that is incorrect
+                User::Leave( KErrNotSupported );
+                }
+            break;
+            }
+        default:
+            {
+            User::Leave( KErrNotSupported );
+            }
+        }
+    TRACE_FUNC_EXIT
+    }
+
+// ----------------------------------------------------------------------------
+// CATCmdPluginEcom::EnableBackLight()
+// ----------------------------------------------------------------------------
+//
+void CATCmdPluginEcom::EnableBackLight()
+	{
+	TRACE_FUNC
+	RProperty::Set( KPSUidCoreApplicationUIs, KLightsATCForcedLightsOn, EForcedLightsOn );
+    }
+
+// ----------------------------------------------------------------------------
+// CATCmdPluginEcom::DisableBackLight()
+// ----------------------------------------------------------------------------
+//
+void CATCmdPluginEcom::DisableBackLight()
+	{
+	TRACE_FUNC
+    RProperty::Set( KPSUidCoreApplicationUIs, KLightsATCForcedLightsOn, EForcedLightsOff );
+    }
+
+// -----------------------------------------------------------------------------
+// CATCmdPluginEcom::LightStatusChanged()
+// -----------------------------------------------------------------------------
+//
+void CATCmdPluginEcom::LightStatusChanged( TInt /*aTarget*/, CHWRMLight::TLightStatus /*aStatus*/ )
+	{
+	//TRACE_STATE(( _L( "** LightStatusChanged %d, %d" ), aTarget, aStatus ))
+  }
+
+// ----------------------------------------------------------------------------
+// CATCmdPluginEcom::IsCommandSupported
+// -
+// ----------------------------------------------------------------------------
+//
+TBool CATCmdPluginEcom::IsCommandSupported( const TDesC8& aCmd )
+    {
+    TRACE_FUNC
+    TBool ret(EFalse);
+    
+    if ( aCmd != KNullDesC8 && ( aCmd.FindF(KAtCkpd) >= 0 || 
+                                 aCmd.FindF(KAtCbklt) >= 0 || aCmd.FindF(KAtCtsa) >= 0 ))
+        {
+        ret = ETrue;
+        }
+    return ret;
+    }
+
+// CATCmdPluginEcom::ParseParameterL
+// -
+// (may leave)
+// ----------------------------------------------------------------------------
+//
+void CATCmdPluginEcom::ParseParametersL( 
+        const TDesC8& aCmd,
+        TInt& aStrokeTime,
+        TInt& aStrokeDelay )
+    {
+    TRACE_FUNC_ENTRY
+    
+    TInt i(0);
+    
+    if ( !aCmd.Length() )
+        {
+        TRACE_ERROR(( _L( "ERROR: invalid stroke time parameter" ) ))            
+        // Not handled
+        User::Leave( KErrNotSupported );           
+        }
+
+
+    // Parse stroke time parameter
+    TBuf8<3> strokeTimeBuf;
+
+    // Go through command until end or parameter separator is reached
+    for ( ; i < aCmd.Length(); i++ )
+        {
+        if ( aCmd[i] >= '0' && aCmd[i] <= '9' )
+            {
+            strokeTimeBuf.Append(aCmd[i]);
+            continue;
+            }
+        else if ( aCmd[i] == ',' || aCmd[i] == '\r' || aCmd[i] == '\n' )
+            {
+            i++;
+            break;
+            }
+        else
+            {
+            TRACE_ERROR(( _L( "ERROR: invalid stroke time parameter" ) ))
+
+            // Not handled
+            User::Leave( KErrNotSupported );   
+            }
+        }
+
+    TLex8 strokeTimeLex( strokeTimeBuf );          
+    strokeTimeLex.Val( aStrokeTime );
+
+    // Verify parsed parameter
+    if ( aStrokeTime < 0 || aStrokeTime > 255 )
+        {
+        TRACE_ERROR(( _L( "ERROR: invalid stroke time parameter" ) ))
+
+        // Not handled
+        User::Leave( KErrNotSupported );
+        }
+
+
+    // Parse stroke delay parameter
+    TBuf8<3> strokeDelayBuf;
+
+    for ( ; i < aCmd.Length(); i++ )
+        {
+        if ( aCmd[i] >= '0' && aCmd[i] <= '9' )
+            {
+            strokeDelayBuf.Append(aCmd[i]);
+            continue;
+            }
+        else if ( aCmd[i] == ',' || aCmd[i] == '\r' || aCmd[i] == '\n' )
+            {
+            break;
+            }
+        else
+            {
+            TRACE_ERROR(( _L( "ERROR: invalid stroke delay parameter" ) ))
+
+            // Not handled
+            User::Leave( KErrNotSupported );   
+            }
+        }
+
+    TLex8 strokeDelayLex( strokeDelayBuf );          
+    strokeDelayLex.Val( aStrokeDelay );
+
+    if ( aStrokeDelay < 0 || aStrokeDelay > 255 )
+        {
+        TRACE_ERROR(( _L( "ERROR: invalid stroke delay parameter" ) ))
+
+        // Not handled
+        User::Leave( KErrNotSupported );
+        }
+    
+    TRACE_FUNC_EXIT
+    }
+
+// ----------------------------------------------------------------------------
+// CATCmdPluginEcom::SendKeyL
+// -
+// (may leave)
+// ----------------------------------------------------------------------------
+//
+void CATCmdPluginEcom::SendKeyL()
+	{
+	TRACE_FUNC
+
+	if ( !iKpdTimer->IsActive() )
+	    {
+	    const TInt count = iCkpdCmdArray->Count();
+	    if ( count )
+	        {
+            TATCkpdCmd cmd = iCkpdCmdArray->At(0);
+            TKeyEvent key;
+            key.iScanCode = cmd.iCode;
+            key.iCode = 0;
+            key.iRepeats = 0;
+            
+            TTimeIntervalMicroSeconds32 strokeTime = cmd.iStrokeTime;
+            TTimeIntervalMicroSeconds32 strokeDelay = cmd.iStrokeDelay;
+
+            TRACE_INFO(( _L( "   Scancode:%d, stroke time:%d, stroke delay: %d" ),
+                        key.iScanCode, strokeTime.Int(), strokeDelay.Int() ))
+
+            if ( iLastEvent == EEventNull || iLastEvent == EEventKeyUp)
+                {
+                SimulateRawEventL( key, EEventKeyDown );                    
+                
+                if ( strokeTime.Int() > 0)
+                    {
+                    iKpdTimer->After( strokeTime );
+                    return;
+                    }
+                }
+            
+            if ( iLastEvent == EEventKeyDown || iLastEvent == EEventKey )
+                {
+                SimulateRawEventL( key, EEventKeyUp );
+
+                iCkpdCmdArray->Delete( 0 );
+                
+                if ( strokeDelay.Int() > 0 && iCkpdCmdArray->Count() > 0 )
+                    {
+                    iKpdTimer->After( strokeDelay );
+                    return;
+                    }
+                else
+                    {
+                    SendNextKeyL();
+                    }
+                }
+	        }
+	    }
+	}
+
+
+// ----------------------------------------------------------------------------
+// CATCmdPluginEcom::SendNextKeyL
+// -
+// (may leave)
+// ----------------------------------------------------------------------------
+//
+void CATCmdPluginEcom::SendNextKeyL()
+    {
+    TRACE_FUNC
+
+    const TInt count = iCkpdCmdArray->Count();
+    if ( count )
+        {
+        SendKeyL();
+        }
+    }
+
+// ----------------------------------------------------------------------------
+// CATCmdPluginEcom::TimerExpiredL
+// -
+// (may leave)
+// ----------------------------------------------------------------------------
+//
+void CATCmdPluginEcom::TimerExpiredL( TInt aRelatedCommand )
+	{
+	TRACE_FUNC
+	
+	if( aRelatedCommand == ECmdCkpd )
+		{
+        SendNextKeyL();
+		}
+	else if ( aRelatedCommand == ECmdCbklt )
+	    {
+	    DisableBackLight();
+	    iLightStatus = ELightOff;
+	    iKeepAliveTimer->Cancel();
+	    }
+	else
+	    {
+	    User::ResetInactivityTime();
+	    iKeepAliveTimer->After( 2000000 );
+	    }
+	}		
+    
+// ----------------------------------------------------------------------------
+// CATCmdPluginEcom::SimulateRawEventL
+// -
+// (may leave)
+// ----------------------------------------------------------------------------
+//
+void CATCmdPluginEcom::SimulateRawEventL( TKeyEvent& aKey, TEventCode aEvent )   
+    {
+    TRACE_FUNC
+
+    TRawEvent rawEvent;
+    TRawEvent::TType rawType( TRawEvent::ENone );
+    switch ( aEvent )
+        {
+        case EEventKeyUp:
+            rawType = TRawEvent::EKeyUp;
+            break;
+        case EEventKeyDown:
+            rawType = TRawEvent::EKeyDown;
+            break;
+        default:
+            break;
+        }
+
+    if ( rawType != TRawEvent::ENone )
+        {
+        rawEvent.Set( rawType, aKey.iScanCode );
+        iWsSession.SimulateRawEvent( rawEvent );
+        iWsSession.Flush();
+        }
+
+    iLastEvent = aEvent;
+    }
+
+// ========================= OTHER EXPORTED FUNCTIONS =========================
+
+// ----------------------------------------------------------------------------
+// CATCmdPluginEcom::CATCmdTimer::CATCmdTimer
+// C++Constructor
+// ----------------------------------------------------------------------------
+//
+CATCmdPluginEcom::CATCmdTimer::CATCmdTimer( MATCmdTimer& aObserver, 
+                                         TInt aRelatedCommand )
+    : CTimer( EPriorityStandard ),
+      iObserver( aObserver ),
+      iRelatedCommand( aRelatedCommand )
+    {
+    TRACE_FUNC
+
+    CActiveScheduler::Add( this );
+    }
+
+// ----------------------------------------------------------------------------
+// CATCmdPluginEcom::CATCmdTimer::ConstructL
+// 2nd phase constructor
+// ----------------------------------------------------------------------------
+//
+void CATCmdPluginEcom::CATCmdTimer::ConstructL()
+    {
+    TRACE_FUNC
+    CTimer::ConstructL();
+    }
+
+// ----------------------------------------------------------------------------
+// CATCmdPluginEcom::CATCmdTimer::RunL
+// Timer callback
+// ----------------------------------------------------------------------------
+//
+void CATCmdPluginEcom::CATCmdTimer::RunL()
+    {
+    TRACE_FUNC
+
+    const TInt err = iStatus.Int();
+    if ( err != KErrCancel )
+        {
+        iObserver.TimerExpiredL( iRelatedCommand );
+        }
+    }
+
+
+void CATCmdPluginEcom::ReportConnectionName( const TDesC8&  /*  aName  */)
+    {
+    
+    }
+void CATCmdPluginEcom::HandleCommandCancel()
+    {
+    
+    }
+void CATCmdPluginEcom::ReportExternalHandleCommandError()
+    {
+    
+    }
+void CATCmdPluginEcom::ReportNvramStatusChange( const TDesC8& /*  aNvram  */)
+    {
+    
+    }
+void CATCmdPluginEcom::ReceiveUnsolicitedResultCancel()
+    {
+    
+    }
+void CATCmdPluginEcom::ReceiveUnsolicitedResult()
+    {
+    
+    }
+TInt CATCmdPluginEcom::GetNextPartOfReply( RBuf8& /* aNextReply  */)
+    {
+    return KErrNone;
+    }
+TInt CATCmdPluginEcom::NextReplyPartLength()
+    {
+    return KErrNone;
+    }
+
+
+//  End of File
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/ATCmdPlugin/src/main.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/ATCmdPlugin/src/main.cpp	Fri Apr 16 15:08:06 2010 +0300
@@ -0,0 +1,56 @@
+
+/*
+ * Copyright (c) 2008-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 :
+ *
+ */
+
+
+
+// INCLUDES
+#include <e32base.h>
+#include <ecom/implementationproxy.h>
+#include "atcmdpluginuids.hrh"
+#include "atcmdplugin.h"
+
+// ============================= LOCAL FUNCTIONS  =============================
+
+// ============================= MEMBER FUNCTIONS =============================
+
+// ========================= OTHER EXPORTED FUNCTIONS =========================
+
+// ----------------------------------------------------------------------------
+// ImplementationTable
+// Ecom plug-in implementation table
+// Status : Approved
+// ----------------------------------------------------------------------------
+//
+const TImplementationProxy ImplementationTable[] =
+	{
+	IMPLEMENTATION_PROXY_ENTRY( KUidATCmdEcomImpl1, CATCmdPluginEcom::NewL ),
+	};
+
+// ----------------------------------------------------------------------------
+// ImplementationGroupProxy
+// Instance of implementation proxy
+// (exported)
+// Status : Approved
+// ----------------------------------------------------------------------------
+//
+EXPORT_C const TImplementationProxy* ImplementationGroupProxy( TInt& aTableCount )
+	{
+	aTableCount = sizeof( ImplementationTable ) / sizeof( TImplementationProxy );
+
+	return ImplementationTable;
+	}
+
+//  End of File  
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/DbRecovery/BWINS/Distribution.Policy.S60
--- a/coreapplicationuis/DbRecovery/BWINS/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/DbRecovery/Distribution.Policy.S60
--- a/coreapplicationuis/DbRecovery/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/DbRecovery/EABI/Distribution.Policy.S60
--- a/coreapplicationuis/DbRecovery/EABI/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/DbRecovery/Group/DbRecovery.mmp
--- a/coreapplicationuis/DbRecovery/Group/DbRecovery.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/DbRecovery/Group/DbRecovery.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -21,7 +21,7 @@
 #include <platform_paths.hrh>
 
 
-TARGET          DbRecovery.exe
+TARGET          dbrecovery.exe
 TARGETTYPE      exexp
 
 UID             0x100039CE 0x10005A17
@@ -42,8 +42,8 @@
 LIBRARY         euser.lib
 LIBRARY         edbms.lib
 LIBRARY         diskspacereserver.lib
-LIBRARY         EFSRV.LIB
-LIBRARY	        CHARCONV.LIB
-LIBRARY         ESTOR.LIB
+LIBRARY         efsrv.lib
+LIBRARY	        charconv.lib
+LIBRARY         estor.lib
 LIBRARY         cntmodel.lib
 // End of File
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/DbRecovery/Group/Distribution.Policy.S60
--- a/coreapplicationuis/DbRecovery/Group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/DbRecovery/Inc/Distribution.Policy.S60
--- a/coreapplicationuis/DbRecovery/Inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/DbRecovery/Src/Distribution.Policy.S60
--- a/coreapplicationuis/DbRecovery/Src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/DbRecovery/rom/Distribution.Policy.S60
--- a/coreapplicationuis/DbRecovery/rom/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Distribution.Policy.S60
--- a/coreapplicationuis/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/GSServerEngine/BWINS/distribution.policy.s60
--- a/coreapplicationuis/GSServerEngine/BWINS/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/GSServerEngine/Distribution.Policy.S60
--- a/coreapplicationuis/GSServerEngine/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/GSServerEngine/EABI/distribution.policy.s60
--- a/coreapplicationuis/GSServerEngine/EABI/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/GSServerEngine/Inc/Distribution.Policy.S60
--- a/coreapplicationuis/GSServerEngine/Inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/GSServerEngine/Logger/Distribution.Policy.S60
--- a/coreapplicationuis/GSServerEngine/Logger/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/GSServerEngine/Src/Distribution.Policy.S60
--- a/coreapplicationuis/GSServerEngine/Src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/GSServerEngine/group/GSServerEngine.mmp
--- a/coreapplicationuis/GSServerEngine/group/GSServerEngine.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/GSServerEngine/group/GSServerEngine.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -19,7 +19,7 @@
 // To get the MW_LAYER_SYSTEMINCLUDE-definition
 #include <platform_paths.hrh>
 
-TARGET                  GSServerEngine.dll
+TARGET                  gsserverengine.dll
 TARGETTYPE              dll
 UID                     0x10281F16
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/GSServerEngine/group/distribution.policy.s60
--- a/coreapplicationuis/GSServerEngine/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/GSServerEngine/rom/distribution.policy.s60
--- a/coreapplicationuis/GSServerEngine/rom/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/NspsWsPlugin/Distribution.Policy.S60
--- a/coreapplicationuis/NspsWsPlugin/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/NspsWsPlugin/group/Distribution.Policy.S60
--- a/coreapplicationuis/NspsWsPlugin/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/NspsWsPlugin/group/NspsWsPlugin.mmp
--- a/coreapplicationuis/NspsWsPlugin/group/NspsWsPlugin.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/NspsWsPlugin/group/NspsWsPlugin.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -18,7 +18,7 @@
 
 #include <platform_paths.hrh>
 
-TARGET          NspsWsPlugin.DLL
+TARGET          nspswsplugin.dll
 TARGETTYPE      ANI
 UID             0x10003B22 0x10005A15
 VENDORID        VID_DEFAULT
@@ -34,7 +34,7 @@
 SOURCE          NspsWsPlugin.cpp
 SOURCE          NspsWsPluginDll.cpp
 
-LIBRARY         EUSER.LIB
+LIBRARY         euser.lib
 
 EXPORTUNFROZEN
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/NspsWsPlugin/group/bld.inf
--- a/coreapplicationuis/NspsWsPlugin/group/bld.inf	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/NspsWsPlugin/group/bld.inf	Fri Apr 16 15:08:06 2010 +0300
@@ -20,7 +20,7 @@
 DEFAULT
 
 PRJ_EXPORTS
-../inc/NspsWsPluginDllStd.h |../../inc/NspsWsPluginDllStd.h
+../inc/NspsWsPluginDllStd.h |../../inc/nspswsplugindllstd.h
 
 PRJ_MMPFILES
 ../group/NspsWsPlugin.mmp
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/NspsWsPlugin/inc/Distribution.Policy.S60
--- a/coreapplicationuis/NspsWsPlugin/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/NspsWsPlugin/src/Distribution.Policy.S60
--- a/coreapplicationuis/NspsWsPlugin/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/NspsWsPlugin/src/NspsWsPlugin.cpp
--- a/coreapplicationuis/NspsWsPlugin/src/NspsWsPlugin.cpp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/NspsWsPlugin/src/NspsWsPlugin.cpp	Fri Apr 16 15:08:06 2010 +0300
@@ -18,7 +18,7 @@
 
 // INCLUDE FILES
 #include <e32property.h>
-#include "CoreApplicationUIsInternalPSKeys.h"
+#include "coreapplicationuisinternalpskeys.h"
 #include "NspsWsPluginDllStd.h"
 #include "NspsWsPlugin.h"         // this
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/Distribution.Policy.S60
--- a/coreapplicationuis/Rfs/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/Plugins/Distribution.Policy.S60
--- a/coreapplicationuis/Rfs/Plugins/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/Plugins/GSRFSPlugin/Distribution.Policy.S60
--- a/coreapplicationuis/Rfs/Plugins/GSRFSPlugin/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/Plugins/GSRFSPlugin/data/Distribution.Policy.S60
--- a/coreapplicationuis/Rfs/Plugins/GSRFSPlugin/data/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/Plugins/GSRFSPlugin/group/Distribution.Policy.S60
--- a/coreapplicationuis/Rfs/Plugins/GSRFSPlugin/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/Plugins/GSRFSPlugin/group/GSRFSPlugin.mmp
--- a/coreapplicationuis/Rfs/Plugins/GSRFSPlugin/group/GSRFSPlugin.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/Rfs/Plugins/GSRFSPlugin/group/GSRFSPlugin.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -20,7 +20,7 @@
 #include <platform_paths.hrh>
 
 CAPABILITY          CAP_ECOM_PLUGIN
-TARGET              GSRFSPlugin.dll
+TARGET              gsrfsplugin.dll
 TARGETTYPE          PLUGIN
 UID                 0x10009D8D 0x10275117
 VENDORID            VID_DEFAULT
@@ -47,7 +47,7 @@
 SOURCEPATH      ../data
 
 START RESOURCE  10275117.rss
-TARGET          GSRFSPlugin.rsc
+TARGET          gsrfsplugin.rsc
 END
 
 START RESOURCE  GSRFSPluginRsc.rss
@@ -68,14 +68,14 @@
 LIBRARY   ws32.lib
 LIBRARY   rfs.lib
 LIBRARY   gsecomplugin.lib
-LIBRARY   CommonEngine.lib
+LIBRARY   commonengine.lib
 LIBRARY   fbscli.lib
-LIBRARY   AknIcon.lib
+LIBRARY   aknicon.lib
 LIBRARY   aknskins.lib
 
 LIBRARY   hlplch.lib
-LIBRARY   GSFramework.lib
-LIBRARY   GSListBox.lib
+LIBRARY   gsframework.lib
+LIBRARY   gslistbox.lib
 
 
 DOCUMENT            10275117.rss
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/Plugins/GSRFSPlugin/inc/Distribution.Policy.S60
--- a/coreapplicationuis/Rfs/Plugins/GSRFSPlugin/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/Plugins/GSRFSPlugin/loc/Distribution.Policy.S60
--- a/coreapplicationuis/Rfs/Plugins/GSRFSPlugin/loc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/Plugins/GSRFSPlugin/src/Distribution.Policy.S60
--- a/coreapplicationuis/Rfs/Plugins/GSRFSPlugin/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/Plugins/cprfsplugin/cprfsplugin.pro
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/Rfs/Plugins/cprfsplugin/cprfsplugin.pro	Fri Apr 16 15:08:06 2010 +0300
@@ -0,0 +1,67 @@
+#
+# Copyright (c) 2010 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:  Project file for the RFS Plugin. It creates the bld.inf and .mmp file on executing
+# qmake command.
+#  
+#
+
+TEMPLATE = lib
+TARGET = cprfsplugin
+DEPENDPATH += . inc src
+INCLUDEPATH += .
+INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
+
+CONFIG += hb\
+           plugin
+           
+MOC_DIR =     moc
+OBJECTS_DIR = obj
+RCC_DIR =     rcc
+
+# Platforms
+SYMBIAN_PLATFORMS = WINSCW \
+                    ARMV5
+
+LIBS += -lcpframework \
+				-lRfs
+# Input
+HEADERS += inc/cprfsplugin.h \
+           inc/cprfssettingsdataformcustomitem.h \
+           inc/cprfssettingsform.h \
+           inc/cprfsview.h
+SOURCES += src/cprfsplugin.cpp \
+           src/cprfssettingsdataformcustomitem.cpp \
+           src/cprfssettingsform.cpp \
+           src/cprfsview.cpp
+
+symbian: { 
+    TARGET.EPOCALLOWDLLDATA = 1
+    DEFINES += PLUGINUID3=0x10275117
+    TARGET.UID3 = 0x10275117    
+}
+symbian { 
+    deploy.path = C:
+    qtplugins.path = /resource/qt/plugins/controlpanel
+    qtplugins.sources += qmakepluginstubs/cprfsplugin.qtplugin    
+    # This is for new exporting system coming in garden
+    for(qtplugin, qtplugins.sources):BLD_INF_RULES.prj_exports += "./$$qtplugin $$deploy.path$$qtplugins.path/$$basename(qtplugin)"
+}
+# Build.inf rules
+BLD_INF_RULES.prj_exports += "$${LITERAL_HASH}include <platform_paths.hrh>" \
+    "rom/cprfssettingsplugin.iby CORE_MW_LAYER_IBY_EXPORT_PATH(cprfssettingsplugin.iby)" 
+
+TARGET.CAPABILITY = All -TCB
+plugin.sources = cprfsplugin.dll
+plugin.path = \resource\qt\plugins\controlpanel
+DEPLOYMENT += plugin	
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/Plugins/cprfsplugin/inc/cprfsplugin.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/Rfs/Plugins/cprfsplugin/inc/cprfsplugin.h	Fri Apr 16 15:08:06 2010 +0300
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2010 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:  
+ *   
+ */
+#ifndef	CPRFSPLUGIN_H
+#define	CPRFSPLUGIN_H
+
+#include <qobject.h>
+#include <cppluginplatinterface.h>
+
+class CpRfsPlugin : public QObject, public CpPluginPlatInterface
+{
+Q_OBJECT
+    Q_INTERFACES(CpPluginPlatInterface)
+public:
+    CpRfsPlugin();
+    ~CpRfsPlugin();
+    virtual CpSettingFormItemData *createSettingFormItemData(CpItemDataHelper &itemDataHelper) const;
+};
+
+#endif	//CPRFSPLUGIN_H
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/Plugins/cprfsplugin/inc/cprfssettingsdataformcustomitem.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/Rfs/Plugins/cprfsplugin/inc/cprfssettingsdataformcustomitem.h	Fri Apr 16 15:08:06 2010 +0300
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2010 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:  
+ *   
+ */
+
+#ifndef CP_RFS_SETTINGS_DATAFORM_CUSTOMITEM_H
+#define CP_RFS_SETTINGS_DATAFORM_CUSTOMITEM_H
+
+#include <hbdataformviewitem.h>
+
+class CpRfsSettingsDataFormCustomItem : public HbDataFormViewItem
+{
+Q_OBJECT
+
+public:
+    CpRfsSettingsDataFormCustomItem(QGraphicsItem *parent);
+    ~CpRfsSettingsDataFormCustomItem();
+};
+
+#endif // CP_RFS_SETTINGS_DATAFORM_CUSTOMITEM_H
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/Plugins/cprfsplugin/inc/cprfssettingsform.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/Rfs/Plugins/cprfsplugin/inc/cprfssettingsform.h	Fri Apr 16 15:08:06 2010 +0300
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2010 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:  
+ *   
+ */
+
+#ifndef CP_RFS_SETTINGSFORM_H
+#define CP_RFS_SETTINGSFORM_H
+
+#include <hbdataform.h>
+
+class HbDataFormModelItem;
+
+class CpRfsSettingsForm : public HbDataForm
+{
+Q_OBJECT
+public:
+    explicit CpRfsSettingsForm(QGraphicsItem *parent = 0);
+    ~CpRfsSettingsForm();
+private:
+    void initRfsSettingModel();
+    // call these function when activated signal is emitted
+    void activateNormalRfs(HbWidget *widget);
+    void activateDeepRfs(HbWidget *widget);
+    
+private slots:
+    void onItemActivated(const QModelIndex &index);
+    void onPressedNormalRfs();
+    void onPressedDeepRfs();
+
+private:
+
+    //DataForm List Items
+    HbDataFormModelItem *mNormalRfs;
+    HbDataFormModelItem *mDeepRfs;
+
+};
+#endif // CP_RFS_SETTINGSFORM_H
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/Plugins/cprfsplugin/inc/cprfsview.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/Rfs/Plugins/cprfsplugin/inc/cprfsview.h	Fri Apr 16 15:08:06 2010 +0300
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2010 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:  
+ *
+ */
+#ifndef	CPRFSVIEW_H
+#define	CPRFSVIEW_H
+
+#include <cpbasesettingview.h>
+
+class CpRfsView : public CpBaseSettingView
+{
+    Q_OBJECT
+public:
+    explicit CpRfsView(QGraphicsItem *parent = 0);
+    ~CpRfsView();
+};
+
+#endif//	CPRFSVIEW_H
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/Plugins/cprfsplugin/rom/cprfssettingsplugin.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/Rfs/Plugins/cprfsplugin/rom/cprfssettingsplugin.iby	Fri Apr 16 15:08:06 2010 +0300
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2010 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:  
+ *   
+ */
+
+#ifndef __CPRFSSETTINGSPLUGIN_IBY__
+#define __CPRFSSETTINGSPLUGIN_IBY__
+
+#include <bldvariant.hrh>
+file=ABI_DIR\BUILD_DIR\cprfsplugin.dll                  SHARED_LIB_DIR\cprfsplugin.dll
+
+data=\epoc32\data\c\resource\qt\plugins\controlpanel\cprfsplugin.qtplugin   resource\qt\plugins\controlpanel\cprfsplugin.qtplugin
+
+#endif
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/Plugins/cprfsplugin/src/cprfsplugin.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/Rfs/Plugins/cprfsplugin/src/cprfsplugin.cpp	Fri Apr 16 15:08:06 2010 +0300
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2010 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:  Creates the plug-in to the control panel.Creates a setting form 
+ * item data, by which the control panel framework can build a setting form model 
+ *
+ */
+#include "cprfsplugin.h"
+#include "cprfsview.h"
+#include <cpsettingformentryitemdataimpl.h>
+#include <cpitemdatahelper.h>
+
+CpRfsPlugin::CpRfsPlugin()
+    {
+    }
+
+CpRfsPlugin::~CpRfsPlugin()
+    {
+    }
+CpSettingFormItemData *CpRfsPlugin::createSettingFormItemData(CpItemDataHelper &itemDataHelper) const
+    {
+    return new CpSettingFormEntryItemDataImpl<CpRfsView>(itemDataHelper,tr("Restore Factory Settings"));
+    }
+
+Q_EXPORT_PLUGIN2(cprfsplugin, CpRfsPlugin);
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/Plugins/cprfsplugin/src/cprfssettingsdataformcustomitem.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/Rfs/Plugins/cprfsplugin/src/cprfssettingsdataformcustomitem.cpp	Fri Apr 16 15:08:06 2010 +0300
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2010 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:  Creates the custom items required for HbDataFormModelItem.
+ *   
+ */
+
+#include <cprfssettingsdataformcustomitem.h>
+#include <hbdataformmodelitem.h>
+#include <hbpushbutton.h>
+
+CpRfsSettingsDataFormCustomItem::CpRfsSettingsDataFormCustomItem(QGraphicsItem *parent) :
+HbDataFormViewItem(parent)
+    {
+    }
+
+CpRfsSettingsDataFormCustomItem::~CpRfsSettingsDataFormCustomItem()
+    {
+    }
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/Plugins/cprfsplugin/src/cprfssettingsform.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/Rfs/Plugins/cprfsplugin/src/cprfssettingsform.cpp	Fri Apr 16 15:08:06 2010 +0300
@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 2010 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:  Creates the view for "Reset" and "Delete Data and Resore" and activates the RFS operation based on the user selection.
+ *   
+ */
+
+#include "cprfssettingsform.h"
+#include "cprfssettingsdataformcustomitem.h"
+
+
+#include <hbdataformmodelitem.h>
+#include <hbdataformmodel.h>
+#include <hbpushbutton.h>
+#include <rfsHandler.h>
+
+CpRfsSettingsForm::CpRfsSettingsForm(QGraphicsItem *parent) :
+    HbDataForm(parent)
+    {
+    this->setHeading(tr("Restore Factory Settings"));
+
+    //initialize the form model
+    initRfsSettingModel();
+
+    connect(this, SIGNAL(activated(QModelIndex)),this, SLOT(onItemActivated(QModelIndex)));
+    }
+
+CpRfsSettingsForm::~CpRfsSettingsForm()
+    {
+    }
+
+void CpRfsSettingsForm::initRfsSettingModel()
+    {
+    HbDataFormModel *model = new HbDataFormModel(0);
+
+		// Create the custom items because HbPushButton cannot be added to the HbDataFormModelItem
+    HbDataFormModelItem::DataItemType customItem = static_cast<HbDataFormModelItem::DataItemType>(HbDataFormModelItem::CustomItemBase + 1);
+                    
+    mNormalRfs = model->appendDataFormItem(customItem, QString(), model->invisibleRootItem());
+    mNormalRfs->setData(HbDataFormModelItem::KeyRole, tr("Restore"));
+
+    HbDataFormModelItem::DataItemType customItem1 = static_cast<HbDataFormModelItem::DataItemType>(HbDataFormModelItem::CustomItemBase + 1);
+                    
+    mDeepRfs = model->appendDataFormItem(customItem1, QString(), model->invisibleRootItem());
+    mDeepRfs->setData(HbDataFormModelItem::KeyRole,tr("Delete Data and Restore"));
+
+    this->setModel(model);
+    }
+
+// On Item activated
+void CpRfsSettingsForm::onItemActivated(const QModelIndex &index)
+    {
+    HbDataFormModelItem *itemData = static_cast<HbDataFormModelItem *> (index.internalPointer());
+    // to deal with orbit change temparialy
+    if (itemData->type() > HbDataFormModelItem::GroupPageItem)
+        {
+        //get the widget of setting item
+        HbWidget* widget = this->dataFormViewItem(index)->dataItemContentWidget();
+
+		if (itemData == mNormalRfs)
+            {
+            activateNormalRfs(widget);
+            }
+		if (itemData == mDeepRfs)
+            {
+            activateDeepRfs(widget);
+            }
+        }
+    }
+
+void CpRfsSettingsForm::activateNormalRfs(HbWidget* widget)
+    {
+    HbPushButton *advanced = qobject_cast<HbPushButton *> (widget);
+    
+    if(advanced)
+        {
+        //TODO Issue in DataForm Calling the itemActivated twice
+        disconnect( advanced, SIGNAL(clicked()), this, SLOT(onPressedNormalRfs()) );
+
+        connect( advanced, SIGNAL(clicked()), this, SLOT(onPressedNormalRfs()) );
+        }
+    }
+
+void CpRfsSettingsForm::activateDeepRfs(HbWidget* widget)
+    {
+    HbPushButton *advanced = qobject_cast<HbPushButton *> (widget);
+    
+    if(advanced)
+        {
+        //TODO Issue in DataForm Calling the itemActivated twice
+        disconnect( advanced, SIGNAL(clicked()), this, SLOT(onPressedDeepRfs()) );
+
+        connect( advanced, SIGNAL(clicked()), this, SLOT(onPressedDeepRfs()) );
+        }
+    }
+
+void CpRfsSettingsForm::onPressedNormalRfs()
+    {
+    CRfsHandler* rfsHandler = new ( ELeave ) CRfsHandler;
+    CleanupStack :: PushL(rfsHandler);
+    
+    //activate the Normal RFS
+    rfsHandler->ActivateRfsL( ERfsNormal );
+    
+    CleanupStack :: PopAndDestroy(rfsHandler);
+
+    }
+
+void CpRfsSettingsForm::onPressedDeepRfs()
+    {
+    CRfsHandler* rfsHandler = new ( ELeave ) CRfsHandler;
+    CleanupStack :: PushL(rfsHandler);
+    
+    //activate the Deep RFS
+    rfsHandler->ActivateRfsL( ERfsDeep );
+    
+    CleanupStack :: PopAndDestroy(rfsHandler);
+    }
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/Plugins/cprfsplugin/src/cprfsview.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/Rfs/Plugins/cprfsplugin/src/cprfsview.cpp	Fri Apr 16 15:08:06 2010 +0300
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2010 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:  Creates the settingForm for RFS plug-in where we can add setting item to the form later.
+ *
+ */
+
+#include "cprfsview.h"
+#include "cprfssettingsform.h"
+
+#include <cpbasesettingview.h>
+#include "cprfssettingsdataformcustomitem.h"
+
+CpRfsView::CpRfsView(QGraphicsItem *parent):
+CpBaseSettingView(0,parent)
+	{
+    CpRfsSettingsForm* settingForm = new CpRfsSettingsForm(this);
+        
+    //custom prototype
+    CpRfsSettingsDataFormCustomItem* customPrototype = new CpRfsSettingsDataFormCustomItem(settingForm);
+    settingForm->setItemPrototype(customPrototype);
+    
+    this->setSettingForm(settingForm);
+	}
+CpRfsView::~CpRfsView()
+    {
+    }
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/Plugins/rfscustcmd/bwins/distribution.policy.s60
--- a/coreapplicationuis/Rfs/Plugins/rfscustcmd/bwins/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/Plugins/rfscustcmd/distribution.policy.s60
--- a/coreapplicationuis/Rfs/Plugins/rfscustcmd/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/Plugins/rfscustcmd/eabi/distribution.policy.s60
--- a/coreapplicationuis/Rfs/Plugins/rfscustcmd/eabi/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/Plugins/rfscustcmd/group/distribution.policy.s60
--- a/coreapplicationuis/Rfs/Plugins/rfscustcmd/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/Plugins/rfscustcmd/inc/distribution.policy.s60
--- a/coreapplicationuis/Rfs/Plugins/rfscustcmd/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/Plugins/rfscustcmd/src/distribution.policy.s60
--- a/coreapplicationuis/Rfs/Plugins/rfscustcmd/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/distribution.policy.s60
--- a/coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/rfscustcmdtest/bwins/distribution.policy.s60
--- a/coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/rfscustcmdtest/bwins/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/rfscustcmdtest/conf/distribution.policy.s60
--- a/coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/rfscustcmdtest/conf/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/rfscustcmdtest/data/distribution.policy.s60
--- a/coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/rfscustcmdtest/data/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/rfscustcmdtest/distribution.policy.s60
--- a/coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/rfscustcmdtest/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/rfscustcmdtest/eabi/distribution.policy.s60
--- a/coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/rfscustcmdtest/eabi/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/rfscustcmdtest/group/distribution.policy.s60
--- a/coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/rfscustcmdtest/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/rfscustcmdtest/inc/distribution.policy.s60
--- a/coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/rfscustcmdtest/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/rfscustcmdtest/init/distribution.policy.s60
--- a/coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/rfscustcmdtest/init/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/rfscustcmdtest/rom/distribution.policy.s60
--- a/coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/rfscustcmdtest/rom/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/rfscustcmdtest/src/distribution.policy.s60
--- a/coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/rfscustcmdtest/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/bmarm/Distribution.Policy.S60
--- a/coreapplicationuis/Rfs/bmarm/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/bwins/Distribution.Policy.S60
--- a/coreapplicationuis/Rfs/bwins/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/eabi/Distribution.Policy.S60
--- a/coreapplicationuis/Rfs/eabi/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/group/Distribution.Policy.S60
--- a/coreapplicationuis/Rfs/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/group/rfs.mmp
--- a/coreapplicationuis/Rfs/group/rfs.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/Rfs/group/rfs.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2002-2010 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"
@@ -29,6 +29,14 @@
 
 USERINCLUDE ../inc
 
+
+SYSTEMINCLUDE		/epoc32/include/mw/hb/hbwidgets
+
+
+LIBRARY		HbWidgets.lib
+
+
+
 MW_LAYER_SYSTEMINCLUDE
 
 SOURCEPATH ../src
@@ -51,18 +59,17 @@
 LIBRARY euser.lib
 LIBRARY efsrv.lib
 LIBRARY bafl.lib
-LIBRARY avkon.lib
 LIBRARY cone.lib
 LIBRARY etel.lib
 LIBRARY etelmm.lib
-LIBRARY CommonEngine.lib
+LIBRARY commonengine.lib
 LIBRARY sysutil.lib
 LIBRARY hal.lib
 LIBRARY secui.lib
 LIBRARY eikcore.lib
-LIBRARY SysLangUtil.lib
-LIBRARY PlatformEnv.lib  // PathInfo
+LIBRARY syslangutil.lib
+LIBRARY platformenv.lib  // PathInfo
 LIBRARY centralrepository.lib // Central Repository
 LIBRARY starterclient.lib
 LIBRARY ecom.lib
-LIBRARY FeatMgr.lib
+LIBRARY featmgr.lib
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/group/rfsMain.mmp
--- a/coreapplicationuis/Rfs/group/rfsMain.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/Rfs/group/rfsMain.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -19,7 +19,7 @@
 
 #include <platform_paths.hrh>
 
-TARGET RfsServer.exe
+TARGET rfsserver.exe
 TARGETTYPE exe
 SOURCEPATH ../src
 VENDORID VID_DEFAULT
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/inc/Distribution.Policy.S60
--- a/coreapplicationuis/Rfs/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/inc/rfsConnectionObserver.h
--- a/coreapplicationuis/Rfs/inc/rfsConnectionObserver.h	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/Rfs/inc/rfsConnectionObserver.h	Fri Apr 16 15:08:06 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2006-2010 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"
@@ -19,6 +19,7 @@
 #ifndef __RFSPDPOBSERVER_H
 #define __RFSPDPOBSERVER_H
 
+#include <hbdeviceprogressdialogsymbian.h>
 
 enum TRfsConnectionCloseState
     {
@@ -26,7 +27,7 @@
     EPdpConnectionClose // this should be the last enum
     };
 
-NONSHARABLE_CLASS( CRfsConnectionObserver ): CActive
+NONSHARABLE_CLASS( CRfsConnectionObserver ): CActive,public MHbDeviceProgressDialogObserver
     {      
 public:
     
@@ -39,6 +40,11 @@
      * Destructor
      */
     virtual ~CRfsConnectionObserver();
+    
+    void ProgressDialogCancelled(const CHbDeviceProgressDialogSymbian* iDialog);
+                    
+    void ProgressDialogClosed(const CHbDeviceProgressDialogSymbian *  iDialog) ;
+
         
 public:
     /**
@@ -128,9 +134,8 @@
     /**
      * Own: Wait dialog
      */
-    CAknWaitDialog* iWaitDialog;
-    
-    /**
+     CHbDeviceProgressDialogSymbian* iDialog ;
+       /**
      * Own: PDP property
      */
     RProperty iPDPProperty;
@@ -169,6 +174,8 @@
     TBool iIsClosingConnectionsApplicable;
     
     TRfsConnectionCloseState iState;
+    //for synchronous dialog handling
+    CActiveSchedulerWait *iWait;
     };
     
 #endif    //RFSPDPOBSERVER_H
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/loc/Distribution.Policy.S60
--- a/coreapplicationuis/Rfs/loc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/rom/Distribution.Policy.S60
--- a/coreapplicationuis/Rfs/rom/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/src/Distribution.Policy.S60
--- a/coreapplicationuis/Rfs/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/src/rfs.rss
--- a/coreapplicationuis/Rfs/src/rfs.rss	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/Rfs/src/rfs.rss	Fri Apr 16 15:08:06 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2002-2010 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"
@@ -27,10 +27,7 @@
 #include "rfs.loc"
 #include <eikon.rsg>
 #include <eikon.rh>
-#include <avkon.rsg>
-#include <avkon.rh>
-#include <avkon.hrh>
-#include <avkon.mbg>
+
 
 // RESOURCE DEFINITIONS 
 
@@ -42,76 +39,12 @@
 
 RESOURCE TBUF r_device_restart { buf = qtn_rfs_note_device_restart; }
 
-// -----------------------------------------------------------------------------
-// R_CONFIRM_RFS
-// -----------------------------------------------------------------------------
 
-RESOURCE DIALOG r_confirm_rfs
-    {
-    flags = EGeneralQueryFlags;
-
-    buttons = R_AVKON_SOFTKEYS_YES_NO__YES;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtQuery;
-            id = EGeneralQuery;
-            control = AVKON_CONFIRMATION_QUERY 
-                { 
-                layout = EConfirmationLayout;
-                label = qtn_rfs_restore_query;
-                };
-            }
-        };
-    }
-
-// -----------------------------------------------------------------------------
-// R_CONFIRM_DEEP_RFS
-// -----------------------------------------------------------------------------
-//
-RESOURCE DIALOG r_confirm_deep_rfs
-    {
-    flags = EGeneralQueryFlags;
+RESOURCE TBUF r_confirm_rfs { buf = qtn_rfs_restore_query; }
 
-    buttons = R_AVKON_SOFTKEYS_YES_NO__YES;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtQuery;
-            id = EGeneralQuery;
-            control = AVKON_CONFIRMATION_QUERY
-                {
-                layout = EConfirmationLayout;
-                label = qtn_rfs_reset_phone_settings;
-                };
-            }
-        };
-    }
+RESOURCE TBUF r_confirm_deep_rfs { buf = qtn_rfs_reset_phone_settings; }
 
-// -----------------------------------------------------------------------------
-// R_CLOSING_CONNECTIONS
-// -----------------------------------------------------------------------------
-//
-RESOURCE DIALOG r_closing_connections
-    {
-    flags = EAknWaitNoteFlags | EEikDialogFlagWait;
-    buttons = R_AVKON_SOFTKEYS_CANCEL;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtNote;
-            id = EGeneralNote;
-            control = AVKON_NOTE
-                {
-                layout = EWaitLayout;
-                singular_label = qtn_rfs_note_closing_connections;
-                animation = R_QGN_GRAF_WAIT_BAR_ANIM;
-                };
-            }
-        };
-    }
+RESOURCE TBUF r_closing_connections { buf = qtn_rfs_note_closing_connections; }
+
 
 // End of File
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/src/rfsConnectionObserver.cpp
--- a/coreapplicationuis/Rfs/src/rfsConnectionObserver.cpp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/Rfs/src/rfsConnectionObserver.cpp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2006-2010 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"
@@ -20,12 +20,12 @@
 // SYSTEM INCLUDES
 #include <rfs.rsg>                      
 #include <PSVariables.h>
-#include <AknWaitDialog.h>
 #include <featmgr.h>
+#include <eikenv.h>  
 #include <centralrepository.h>
-#include <AknWaitDialog.h>
 #include <pdpcontextmanagerpskeys.h>
 #include <pdpcontextmanagerinternalcrkeys.h>
+#include <StringLoader.h> 
 
 // P&S KEYS FROM SIP & PDP CONNECTION
 #include <e32property.h>
@@ -111,12 +111,12 @@
     // proceed further to create a common dialog. This will be a wait for dialog which will be 
     // of synchrnous type and can only be closed inside the RunL() of this active class.
     // Provisions needed to be added to know whether this dialog needs resetting the pointer,
-    // this will be the case when dialog is actually started using 'ExecuteLD()', 
+    // this will be the case when dialog is actually started using 'showl()', 
     // Otherwise we need to delete this dialog and reset the pointer to NULL.
-    if (iIsDialogNeedToBeDisplayed)
-        {
-        iWaitDialog = new( ELeave ) CAknWaitDialog(reinterpret_cast<CEikDialog**>( &iWaitDialog ) );
-        }
+   if (iIsDialogNeedToBeDisplayed)
+       {
+       iDialog = CHbDeviceProgressDialogSymbian::NewL(CHbDeviceProgressDialogSymbian::EWaitDialog);
+       }
    
     // Now we proceed further to setting of the next state i,e, enter the state machine of this active object
     // which will start from closing of the active connections and proceed to close the other connections
@@ -171,6 +171,7 @@
     {
     TRACES("CRfsConnectionObserver::~CRfsConnectionObserver()");
     Cancel();
+    delete iWait;
     TRACES("CRfsConnectionObserver::~CRfsConnectionObserver(): End");
     }
 
@@ -214,31 +215,59 @@
         return EFalse; 
         }
     
-    // we set the flag to indicate ExecuteLD is called and the dialog needs to be
+    // we set the flag to indicate showl is called and the dialog needs to be
     // dismissed from within the RunL()
     iIsWaitForDialogExecuted = ETrue;
     // Start displaying the dialog which will then be closed form the RunL()
     // Here the code execution blocks and we will proceed further only when 
     // this dialog is canceled
-    err = iWaitDialog->ExecuteLD( R_CLOSING_CONNECTIONS );
+
+    HBufC* prompt = StringLoader::LoadLC( R_CLOSING_CONNECTIONS ); 
     
-    
+    iDialog->SetTextL(*prompt);
+             
+    //observer interface is used since showl is aynchronous and we have to have callbacks 
+    //if cancel is pressed or dialog is closed
+    iDialog->SetObserver(this);   
+    iDialog->ShowL();
+    //activeschedulerwait is used since we want synchronous execution and control goes into 
+    //a loop here and returns to start when dialog is cancelled or closed.              
+    iWait = new (ELeave) CActiveSchedulerWait;
+    iWait->Start();
+    delete iWait;
+    iWait=NULL;
+    CleanupStack::PopAndDestroy( prompt );
+              
+    return iAllConnectionClosed;
+     }
+
+void CRfsConnectionObserver::ProgressDialogCancelled(const CHbDeviceProgressDialogSymbian* iDialog)
+{
     // following is the case when the user presses the Cancel button from the wait 
     // for dialog and in that case we need to resend the notificaiton of RFS failed
-    // to whom all we have told previous of this to close the RFS connection
-    if (err == EEikBidCancel)
-        {
-        if (iIsSipInformedForClosingAllConnection)
-            {
-            err = iSIPProperty.Set(KPSSipRfsUid, KSipRfsState, ESipRfsFailed );
-            }
-        if (iIsPDPInformedforClosingAllConnection)
-            {
-            iPDPProperty.Set(KPDPContextManager2,KPDPContextManagerFactorySettingsReset,EPDPContextManagerFactorySettingsResetStop);
-            }
-        }
-    return iAllConnectionClosed;
-    }
+    // to whom all we have told previous of this to close the RFS connection 
+    
+    if (iIsSipInformedForClosingAllConnection)
+                {
+             TInt    err = iSIPProperty.Set(KPSSipRfsUid, KSipRfsState, ESipRfsFailed );
+                }
+    if (iIsPDPInformedforClosingAllConnection)
+                {
+                iPDPProperty.Set(KPDPContextManager2,KPDPContextManagerFactorySettingsReset,EPDPContextManagerFactorySettingsResetStop);
+                }
+       
+                   
+        
+}
+
+
+void CRfsConnectionObserver::ProgressDialogClosed(const CHbDeviceProgressDialogSymbian *  iDialog)
+{
+    //this function is called when the dialog is closed ,note that the control from progressdialogcancelled  
+    //comes to ProgressDialogClosed once dialog is closed
+      iWait->AsyncStop(); //from here the control goes to iWait->start();
+}
+
 
 void CRfsConnectionObserver::ReportRfsCompletionToSip()
     {
@@ -443,22 +472,21 @@
     {
     TRACES("CRfsConnectionObserver::DismissWaitDialog()");
     
-    if ( iWaitDialog && iIsWaitForDialogExecuted)
+    if ( iDialog && iIsWaitForDialogExecuted)
         {
-        TRAP_IGNORE( iWaitDialog->ProcessFinishedL() );
+        iDialog->Cancel();
         }
     
     // Sanity Check:
     // It can be a case when dialog was need to be displayed but was not due to some error
-    // this means that the 'iWaitDialog' was constructed but never used and destroyed
-    // i.e. the ExecuteLD() was never called
-    else if(iIsDialogNeedToBeDisplayed && !iIsWaitForDialogExecuted)
+    // this means that the 'iDialog' was constructed but never used and destroyed
+    // i.e. the showl() was never called
+   else if(iIsDialogNeedToBeDisplayed && !iIsWaitForDialogExecuted)
         {
-        delete iWaitDialog;
+        delete iDialog;
         }
-    
-    // Reset the pointer to NULL
-    iWaitDialog = NULL;
+      // Reset the pointer to NULL
+    iDialog = NULL;
     
     TRACES("CRfsConnectionObserver::DismissWaitDialog(): End");
     }
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/Rfs/src/rfsHandler.cpp
--- a/coreapplicationuis/Rfs/src/rfsHandler.cpp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/Rfs/src/rfsHandler.cpp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2008-2010 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"
@@ -39,10 +39,7 @@
 
 #include <secui.h>                  // security UI
 #include <secuisecurityhandler.h>
-
-#include <aknnotewrappers.h>
-#include <AknQueryDialog.h>
-
+#include <StringLoader.h>
 #include <hal.h>
 #include <centralrepository.h>
 #include <CommonEngineDomainCRKeys.h>
@@ -50,16 +47,18 @@
 #include <data_caging_path_literals.hrh>
 
 #include "CleanupResetPointer.h"
-#include <AknWaitDialog.h>
 #include <pdpcontextmanagerpskeys.h>
 #include <pdpcontextmanagerinternalcrkeys.h>
 #include "rfsConnectionObserver.h"
 #include "rfsHandler.h"
 #include "rfsClient.h"
 #include "RfsTraces.h"
+#include <hbdevicemessageboxsymbian.h>
 
 
 _LIT( KRfsResourceFileName, "Z:rfs.rsc");
+_LIT(KYes,"yes");
+_LIT(KNo,"No");
 
 // CONSTANTS
 const TInt KPhoneIndex = 0;
@@ -187,11 +186,18 @@
         if( startersession.Connect() == KErrNone )
             {
 			// Displays information note to the user telling that the device will restart
-            HBufC* prompt = iEnv->AllocReadResourceLC( R_DEVICE_RESTART );
-            CAknInformationNote* note = new ( ELeave ) CAknInformationNote( ETrue );
-            note->ExecuteLD( *prompt );
-            CleanupStack::PopAndDestroy( prompt );
-			
+            HBufC* prompt = StringLoader::LoadLC( R_DEVICE_RESTART );
+                 
+          CHbDeviceMessageBoxSymbian* note = CHbDeviceMessageBoxSymbian::NewL(CHbDeviceMessageBoxSymbian::EInformation);
+                CleanupStack::PushL(note);
+                note->SetTextL(*prompt);
+                note->ShowL();
+                 CleanupStack::PopAndDestroy(note);
+                CleanupStack::PopAndDestroy( prompt );
+                	
+                	              
+               
+                
             if (aType == ERfsNormal ) startersession.Reset( RStarterSession::ENormalRFSReset );
             else if (aType == ERfsDeep ) startersession.Reset( RStarterSession::EDeepRFSReset );
             else startersession.Reset( RStarterSession::EUnknownReset );
@@ -238,12 +244,9 @@
 EXPORT_C void CRfsHandler::Cancel()
     {
     TRACES("CRfsHandler::Cancel()");
-
-    // delete confirmation query
-    delete iQuery;
-    iQuery = NULL;
-
-    // delete security handler
+    
+     
+     // delete security handler
     if ( iSecurityHandler )
         {
         iSecurityHandler->CancelSecCodeQuery();
@@ -326,32 +329,26 @@
 TBool CRfsHandler::AskConfirmationL( const TBool& aThisDestroyed, TRfsType aType )
     {
     TRACES("CRfsHandler::AskConfirmationL()");
-    CleanupResetPointerPushL( iQuery );
-
-    // Show the confirmation query.
-
-    iQuery = CAknQueryDialog::NewL(); // no tone as default
-
+     
+   
     TInt resourceId = ( aType == ERfsNormal ) ? R_CONFIRM_RFS : R_CONFIRM_DEEP_RFS;
-    //iQuery->SetSize();
-    //iQuery->pref
-    
-    TBool ret = iQuery->ExecuteLD( resourceId );
-
-    if ( aThisDestroyed )
+    HBufC* query = iEnv->AllocReadResourceLC( resourceId );
+         
+   // Show the confirmation query.
+          
+   CHbDeviceMessageBoxSymbian::TButtonId selection = CHbDeviceMessageBoxSymbian::QuestionL(*query, KYes, KNo);
+    TBool ret;    
+    if (selection == CHbDeviceMessageBoxSymbian::EAcceptButton) // user pressed yes
         {
-        // this object was destroyed
-        ret = EFalse;
-        // remove cleanup item
-        CleanupStack::Pop();
+        ret=ETrue;
         }
     else
         {
-        // NULLs iQuery
-        CleanupStack::PopAndDestroy();
-        }
-
-    return ret;
+        ret=EFalse;
+        }  
+    CleanupStack::PopAndDestroy(query);
+    return ret;  
+    
     }
 
 // -----------------------------------------------------------------------------
@@ -441,11 +438,13 @@
         {
         HBufC* prompt = iEnv->AllocReadResourceLC( R_ACTIVE_CALLS );
 
-        CAknInformationNote* note = new ( ELeave ) CAknInformationNote( ETrue );
-
-        note->ExecuteLD( *prompt );
-
-        CleanupStack::PopAndDestroy( prompt );
+           CHbDeviceMessageBoxSymbian* note = CHbDeviceMessageBoxSymbian::NewL(CHbDeviceMessageBoxSymbian::EInformation);
+                CleanupStack::PushL(note);
+                        note->SetTextL(*prompt);
+                        note->ShowL();
+                         CleanupStack::PopAndDestroy( note );
+                        CleanupStack::PopAndDestroy( prompt );
+               
         return ETrue;
         }
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/SysAp/Aif/Distribution.Policy.S60
--- a/coreapplicationuis/SysAp/Aif/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/SysAp/CenRep/CoreApplicationUIsPrivateCRKeys.h
--- a/coreapplicationuis/SysAp/CenRep/CoreApplicationUIsPrivateCRKeys.h	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/SysAp/CenRep/CoreApplicationUIsPrivateCRKeys.h	Fri Apr 16 15:08:06 2010 +0300
@@ -21,7 +21,7 @@
 #define COREAPPLICATIONUISPRIVATECRKEYS_H
 
 // INCLUDES
-#include <CoreApplicationUIsSDKCRKeys.h>
+#include <coreapplicationuissdkcrkeys.h>
 
 // =============================================================================
 // CoreAppUIs Configuration API
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/SysAp/CenRep/Distribution.Policy.S60
--- a/coreapplicationuis/SysAp/CenRep/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/SysAp/Data/Distribution.Policy.S60
--- a/coreapplicationuis/SysAp/Data/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/SysAp/Data/SysAp.rss
--- a/coreapplicationuis/SysAp/Data/SysAp.rss	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/SysAp/Data/SysAp.rss	Fri Apr 16 15:08:06 2010 +0300
@@ -21,7 +21,7 @@
 
 //  INCLUDES
 #include <eikon.rh>
-#include <sysap.loc>
+#include <SysAp.loc>
 #include <avkon.loc>
 #include <avkon.rsg>
 #include <AiwCommon.rh>
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/SysAp/Distribution.Policy.S60
--- a/coreapplicationuis/SysAp/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/SysAp/Group/Distribution.Policy.S60
--- a/coreapplicationuis/SysAp/Group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/SysAp/Group/SysAp.mmp
--- a/coreapplicationuis/SysAp/Group/SysAp.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/SysAp/Group/SysAp.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -18,7 +18,7 @@
 
 #include <data_caging_paths.hrh>
 #include <platform_paths.hrh>
-TARGET      SysAp.exe
+TARGET      sysap.exe
 TARGETTYPE  exe
 UID         0x0 0x100058F3
 
@@ -84,7 +84,7 @@
 LIBRARY logcli.lib
 
 SOURCE SysApAccessoryObserver.cpp
-LIBRARY AccClient.lib
+LIBRARY accclient.lib
 
 SOURCE SysApEtelConnector.cpp
 
@@ -180,7 +180,7 @@
 USERINCLUDE        ../CenRep
 USERINCLUDE        ../PubSub
 
-APP_LAYER_SYSTEMINCLUDE // used instead of MW_LAYER_SYSTEMINCLUDE due to dependencies to APP layer
+MW_LAYER_SYSTEMINCLUDE 
 
 LIBRARY euser.lib
 LIBRARY apparc.lib
@@ -193,14 +193,14 @@
 LIBRARY aknnotify.lib
 LIBRARY eiksrvc.lib
 LIBRARY connmon.lib
-LIBRARY DSClient.lib
-LIBRARY ProfileEng.lib
-LIBRARY StarterClient.lib
+LIBRARY dsclient.lib
+LIBRARY profileeng.lib
+LIBRARY starterclient.lib
 LIBRARY centralrepository.lib
-LIBRARY CenRepNotifHandler.lib
-LIBRARY CommonEngine.lib
-LIBRARY ActivityManager.lib
-LIBRARY AknCapServerClient.lib
+LIBRARY cenrepnotifhandler.lib
+LIBRARY commonengine.lib
+LIBRARY activitymanager.lib
+LIBRARY akncapserverclient.lib
 LIBRARY secui.lib
 LIBRARY sssettings.lib
 LIBRARY fbscli.lib
@@ -220,11 +220,11 @@
 LIBRARY hwrmfmtxclient.lib
 LIBRARY	remconcoreapi.lib
 LIBRARY	remconinterfacebase.lib
-LIBRARY AknIcon.lib
-LIBRARY CdlEngine.lib
+LIBRARY aknicon.lib
+LIBRARY cdlengine.lib
 
 // POC launching
-LIBRARY ServiceHandler.lib
+LIBRARY servicehandler.lib
 
 LIBRARY ecom.lib
 
@@ -232,7 +232,7 @@
 LIBRARY mediatorclient.lib
 LIBRARY bmpanim.lib
 
-LIBRARY TelephonyAudioRouting.lib
+LIBRARY telephonyaudiorouting.lib
 LIBRARY etelpckt.lib
 
 #ifdef RD_MULTIPLE_DRIVE
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/SysAp/Group/bld.inf
--- a/coreapplicationuis/SysAp/Group/bld.inf	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/SysAp/Group/bld.inf	Fri Apr 16 15:08:06 2010 +0300
@@ -41,11 +41,11 @@
 ../rom/SysAp_variant.iby CUSTOMER_MW_LAYER_IBY_EXPORT_PATH(SysAp_variant.iby)
 ../loc/SysAp.loc MW_LAYER_LOC_EXPORT_PATH(SysAp.loc)
 
-../PubSub/CoreApplicationUIsInternalPSKeys.h |../../../inc/CoreApplicationUIsInternalPSKeys.h
-../PubSub/CoreApplicationUIsPrivatePSKeys.h |../../inc/CoreApplicationUIsPrivatePSKeys.h
-../CenRep/CoreApplicationUIsPrivateCRKeys.h |../../inc/CoreApplicationUIsPrivateCRKeys.h
+../PubSub/CoreApplicationUIsInternalPSKeys.h |../../../inc/coreapplicationuisinternalpskeys.h
+../PubSub/CoreApplicationUIsPrivatePSKeys.h |../../inc/coreapplicationuisprivatepskeys.h
+../CenRep/CoreApplicationUIsPrivateCRKeys.h |../../inc/coreapplicationuisprivatecrkeys.h
 
-../PubSub/CoreApplicationUIsPrivatePSKeys.h |../../../inc/CoreApplicationUIsPrivatePSKeys.h // Illegal export for avoiding breaks
+../PubSub/CoreApplicationUIsPrivatePSKeys.h |../../../inc/coreapplicationuisprivatepskeys.h // Illegal export for avoiding breaks
 
 PRJ_MMPFILES
 //gnumakefile sysap_icons.mk 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/SysAp/Inc/Distribution.Policy.S60
--- a/coreapplicationuis/SysAp/Inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/SysAp/Inc/SysApAppUi.h
--- a/coreapplicationuis/SysAp/Inc/SysApAppUi.h	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/SysAp/Inc/SysApAppUi.h	Fri Apr 16 15:08:06 2010 +0300
@@ -37,7 +37,7 @@
 #include "MSysApPropertyResponder.h"
 #include "SysApTimer.h"
 #include <e32property.h>
-#include "CoreApplicationUIsPrivateCRKeys.h"
+#include "coreapplicationuisprivatecrkeys.h"
 #include <sysapcallback.h>
 
 #include "SysApAccessoryObserver.h"
@@ -1657,8 +1657,7 @@
      	*/
          TBool IsEncryptionOperationOngoingL() const;
 		 TInt iKeyBoardRepeatCount;
-		 TBool iFlagForRmvMmcFrmShortPwrKey;
-    };
+		     };
 
 #endif      // SYSAPAPPUI_H
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/SysAp/PubSub/CoreApplicationUIsPrivatePSKeys.h
--- a/coreapplicationuis/SysAp/PubSub/CoreApplicationUIsPrivatePSKeys.h	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/SysAp/PubSub/CoreApplicationUIsPrivatePSKeys.h	Fri Apr 16 15:08:06 2010 +0300
@@ -21,7 +21,7 @@
 #define COREAPPLICATIONUISPRIVATEPSKEYS_H
 
 // INCLUDES
-#include "CoreApplicationUIsInternalPSKeys.h"
+#include "coreapplicationuisinternalpskeys.h"
 
 #endif      // COREAPPLICATIONUISPRIVATEPSKEYS_H
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/SysAp/PubSub/Distribution.Policy.S60
--- a/coreapplicationuis/SysAp/PubSub/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/SysAp/Src/Bt/Distribution.Policy.S60
--- a/coreapplicationuis/SysAp/Src/Bt/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/SysAp/Src/BtSap/Distribution.Policy.S60
--- a/coreapplicationuis/SysAp/Src/BtSap/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/SysAp/Src/CenRepObservers/Distribution.Policy.S60
--- a/coreapplicationuis/SysAp/Src/CenRepObservers/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/SysAp/Src/CenRepObservers/SysApCenRepLogsObserver.cpp
--- a/coreapplicationuis/SysAp/Src/CenRepObservers/SysApCenRepLogsObserver.cpp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/SysAp/Src/CenRepObservers/SysApCenRepLogsObserver.cpp	Fri Apr 16 15:08:06 2010 +0300
@@ -69,6 +69,12 @@
 
 void CSysApCenRepLogsObserver::ConstructL()
     {
+    const TUid KCRUidLogs = {0x101F874E};
+    /**
+    * Informs the Logs application about the amount of new missed calls.
+    * Integer type
+    **/
+    const TUint32 KLogsNewMissedCalls = 0x00000006;
     TRAPD( err, iSession = CRepository::NewL( KCRUidLogs ) );
     TRACES( RDebug::Print( _L("CSysApCenRepLogsObserver::ConstructL: err=%d (KCRUidLogs)"), err ) );
     User::LeaveIfError( err );
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/SysAp/Src/CenRepObservers/SysApCenRepLogsObserver.h
--- a/coreapplicationuis/SysAp/Src/CenRepObservers/SysApCenRepLogsObserver.h	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/SysAp/Src/CenRepObservers/SysApCenRepLogsObserver.h	Fri Apr 16 15:08:06 2010 +0300
@@ -23,7 +23,7 @@
 #include <e32base.h>
 #include <centralrepository.h>
 #include <cenrepnotifyhandler.h>
-#include <LogsDomainCRKeys.h>
+//#include <LogsDomainCRKeys.h>
 
 // FORWARD DECLARATIONS
 class CSysApAppUi;
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/SysAp/Src/Distribution.Policy.S60
--- a/coreapplicationuis/SysAp/Src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/SysAp/Src/OfflineModeController/Distribution.Policy.S60
--- a/coreapplicationuis/SysAp/Src/OfflineModeController/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/SysAp/Src/PrivacyFramework/Distribution.Policy.S60
--- a/coreapplicationuis/SysAp/Src/PrivacyFramework/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/SysAp/Src/SysApAppUi.cpp
--- a/coreapplicationuis/SysAp/Src/SysApAppUi.cpp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/SysAp/Src/SysApAppUi.cpp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2005-2010 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"
@@ -36,7 +36,7 @@
 #include <hwrmdomainpskeys.h>
 
 #include <PSVariables.h>
-#include "CoreApplicationUIsPrivatePSKeys.h"
+#include "coreapplicationuisprivatepskeys.h"
 #include <ctsydomainpskeys.h>
 #include <startupdomainpskeys.h>
 #include <startupdomaincrkeys.h>
@@ -77,8 +77,8 @@
 #include "SysApCenRepBTObserver.h"
 #include "SysApCenRepHacSettingObserver.h"
 #include "SysApCenRepController.h"
-#include "CoreApplicationUIsPrivateCRKeys.h"
-#include "CoreApplicationUIsPrivatePSKeys.h"
+#include "coreapplicationuisprivatecrkeys.h"
+#include "coreapplicationuisprivatepskeys.h"
 #include <UikonInternalPSKeys.h>
 
 #include "SysApStartupController.h"
@@ -261,7 +261,7 @@
     BaseConstructL( EAknEnableSkin );
     TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: BaseConstructL() OK") ) );
     
-    iFlagForRmvMmcFrmShortPwrKey = EFalse;
+   
 
     /*SysAp is set as system application (Symbian terminology). This means some special privilege compared
       to other applications. For example it does not get closed when system is asked to close applications
@@ -344,7 +344,8 @@
 
     // Define P&S keys "owned" by SysAp
     RProperty::Define( KPSUidUikon, KUikMMCInserted, RProperty::EInt, KAlwaysPassPolicy, KWriteDeviceDataPolicy );
-    
+    //initially assuming that the memory card is not inserted
+    RProperty::Set( KPSUidUikon, KUikMMCInserted, 0 );
     TDriveInfo driveInfo;
     TInt driveNumber; 
     TInt err;    
@@ -352,7 +353,7 @@
     for ( driveNumber = EDriveD; driveNumber < EDriveZ; driveNumber++ )
          {
 	  err = fileServer.Drive(driveInfo,driveNumber);
-          if(err == KErrNone && driveInfo.iType == EMediaHardDisk &&  driveInfo.iDriveAtt & KDriveAttRemovable)     
+          if(driveNumber == EDriveF && err == KErrNone && driveInfo.iType == EMediaHardDisk &&  driveInfo.iDriveAtt & KDriveAttRemovable)     
         	{     
         	TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: err = %d, driveInfo.iType = %d, driveInfo.iDriveAtt %d, KDriveAttRemovable = %d "),err,driveInfo.iType,driveInfo.iDriveAtt,KDriveAttRemovable) );     
         	RProperty::Set( KPSUidUikon, KUikMMCInserted, 1 );
@@ -3897,7 +3898,6 @@
                 _L( "CSysApAppUi::PowerKeyPopUpMenuSelectionDoneL: \"Eject\" selected, drive=%d" ),
                 iDriveToEject ) );
             iSysApDriveList->ResetDrivesToEject();
-            iFlagForRmvMmcFrmShortPwrKey = ETrue;
             RProperty::Set( KPSUidUikon, KUikMMCInserted, 0 );
             EjectMMCL();
             }
@@ -4671,6 +4671,25 @@
         }
     }
 
+/**
+ * To check the for an emergency call. 
+ * 
+ * @return ETrue if there is an emergency call active otherwise, EFalse.
+ */
+TBool IsEmergencyCall()
+        {
+        TBool retVal( EFalse );
+        TInt err( KErrNone );
+        TInt state( 0 );
+     
+        err = RProperty::Get(KPSUidCtsyEmergencyCallInfo, KCTSYEmergencyCallInfo, state );
+        if ( err == KErrNone && state )
+            {
+            retVal = ETrue;            
+            }
+        return retVal;
+        }	
+
 // ----------------------------------------------------------------------------
 // CSysApAppUi::HandleCurrentCallStateChangeL()
 // ----------------------------------------------------------------------------
@@ -4687,8 +4706,9 @@
     switch ( aCurrentCallState )
         {
         case EPSCTsyCallStateRinging:
+            {
             iSysApLightsController->CallComingInL( ETrue );
-            // disable keylock when a call is coming in
+            // Disable keylock when a call is coming in
             if ( iKeyLockEnabled || iDeviceLockEnabled || iKeyLockOnBeforeCradle || iKeyLockOnBeforeAlarm )
                 {
                 TRACES( RDebug::Print( _L("CSysApAppUi::HandleCurrentCallStateChangeL: EPSCTsyCallStateRinging: disable keylock") ) );
@@ -4703,24 +4723,29 @@
                     }
                 }
             break;
-
+            }
+            
         case EPSCTsyCallStateDialling:
-            // disable keylock during an emergency call
+            {
+            // Disable keypad lock during an emergency call
+            // no need to disable the key lock when a call is made using the wireless car-kit
+            // but if the call is an emergency one then we will disable the keypad lock
             if ( iKeyLockEnabled || iDeviceLockEnabled || iKeyLockOnBeforeCradle )
                 {
                 TRACES( RDebug::Print( _L("CSysApAppUi::HandleCurrentCallStateChangeL: EPSCTsyCallStateDialling: disable keylock") ) );
                 iKeyLockOnBeforeCall = ETrue;
 
-                if ( iKeyLockEnabled || iDeviceLockEnabled )
+                if ( IsEmergencyCall() && (iKeyLockEnabled || iDeviceLockEnabled ))
                     {
                     KeyLock().DisableWithoutNote();
                     }
                 }
 
-            // enable signal & network indicators when an emergency call is made in Offline Mode
+            // Enable signal & network indicators when an emergency call is made in Offline Mode
             if( iSysApOfflineModeController->OfflineModeActive() )
                     {
-                    if ( StateOfProperty(KPSUidCtsyCallInformation, KCTsyCallType) != EPSCTsyCallTypeVoIP) // signal indicators not updated with VoIP call
+                    // Signal indicators not updated with VoIP call
+                    if ( StateOfProperty(KPSUidCtsyCallInformation, KCTsyCallType) != EPSCTsyCallTypeVoIP) 
                         {
                         iEmergencyCallActive = ETrue;
                         UpdateSignalBarsL();
@@ -4728,11 +4753,13 @@
                         }
                     }
             break;
-
+            }
+            
         case EPSCTsyCallStateConnected:
+            {
             if (StateOfProperty(KPSUidCtsyCallInformation, KCTsyCallType) == EPSCTsyCallTypeCSVoice)
                 {
-                // check if GPRS suspended note is required
+                // Check if GPRS suspended note is required
                 iCallActivated = ETrue;
                 HandleGprsNotesL();
                 }
@@ -4743,9 +4770,11 @@
                 KeyLock().EnableAutoLockEmulation();
                 }
             break;
+            }
 
         case EPSCTsyCallStateNone:
-            // reset timers in ScreenSaver and Autolock
+            {
+            // Reset timers in ScreenSaver and Autolock
             User::ResetInactivityTime();
 
             if ( iEmergencyCallActive )
@@ -4785,6 +4814,8 @@
                 }
             iCallActivated = EFalse;
             break;
+            }
+            
         default:
             break;
         }
@@ -5386,12 +5417,8 @@
                     {
                     if ( memoryCardStatus == ESysApMemoryCardInserted )
                         {
-                        if(!iFlagForRmvMmcFrmShortPwrKey)
-                        	{
-                        	RProperty::Set( KPSUidUikon, KUikMMCInserted, 1 );
-                      		}
-                      		iFlagForRmvMmcFrmShortPwrKey = EFalse;
-                        }
+                         RProperty::Set( KPSUidUikon, KUikMMCInserted, 1 );
+                      	}
                     else
                         {
                         RProperty::Set( KPSUidUikon, KUikMMCInserted, 0 );
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/SysAp/Src/SysApCenRepController.cpp
--- a/coreapplicationuis/SysAp/Src/SysApCenRepController.cpp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/SysAp/Src/SysApCenRepController.cpp	Fri Apr 16 15:08:06 2010 +0300
@@ -20,7 +20,7 @@
 #include "SysApCenRepController.h"
 #include "SysApAppUi.h"
 #include "SysAp.hrh"
-#include "CoreApplicationUIsPrivateCRKeys.h"
+#include "coreapplicationuisprivatecrkeys.h"
 #include "accessoriescrkeys.h"
 
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/SysAp/Src/SysApFeatureManager.cpp
--- a/coreapplicationuis/SysAp/Src/SysApFeatureManager.cpp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/SysAp/Src/SysApFeatureManager.cpp	Fri Apr 16 15:08:06 2010 +0300
@@ -23,7 +23,7 @@
 #include "SysApFeatureManager.h"
 #include "SysAp.hrh"
 #include <centralrepository.h>
-#include "CoreApplicationUIsPrivateCRKeys.h"
+#include "coreapplicationuisprivatecrkeys.h"
 #include <hwrmlight.h>
 #include <AknUtils.h>
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/SysAp/Src/SysApLightsController.cpp
--- a/coreapplicationuis/SysAp/Src/SysApLightsController.cpp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/SysAp/Src/SysApLightsController.cpp	Fri Apr 16 15:08:06 2010 +0300
@@ -20,7 +20,7 @@
 #include <activitymanager.h>
 #include "SysApLightsController.h"
 #include "SysApAppUi.h"
-#include "CoreApplicationUIsInternalPSKeys.h"
+#include "coreapplicationuisinternalpskeys.h"
 #include <e32svr.h>
 #include <hwrmdomainpskeys.h>
 #include "SysApFeatureManager.h"
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/SysAp/Src/SysApNspsAnim.cpp
--- a/coreapplicationuis/SysAp/Src/SysApNspsAnim.cpp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/SysAp/Src/SysApNspsAnim.cpp	Fri Apr 16 15:08:06 2010 +0300
@@ -19,7 +19,7 @@
 // INCLUDE FILES
 #include "SysApNspsAnim.h"              // This
 #include <coecntrl.h>                   // CCoeControl
-#include "NspsWsPluginDllStd.h"         // Command
+#include "nspswsplugindllstd.h"         // Command
 
 // ============================ MEMBER FUNCTIONS ==============================
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/SysAp/Src/SysApPubSubObserver.cpp
--- a/coreapplicationuis/SysAp/Src/SysApPubSubObserver.cpp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/SysAp/Src/SysApPubSubObserver.cpp	Fri Apr 16 15:08:06 2010 +0300
@@ -20,7 +20,7 @@
 #include <e32property.h>
 #include <sacls.h>
 #include <startupdomainpskeys.h>
-#include "CoreApplicationUIsPrivatePSKeys.h"
+#include "coreapplicationuisprivatepskeys.h"
 #include <ctsydomainpskeys.h>
 #include <wlaninternalpskeys.h>
 #include <connect/sbdefs.h>
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/SysAp/Src/SysApSimChanged.cpp
--- a/coreapplicationuis/SysAp/Src/SysApSimChanged.cpp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/SysAp/Src/SysApSimChanged.cpp	Fri Apr 16 15:08:06 2010 +0300
@@ -20,7 +20,7 @@
 #include "SysApSimChanged.h"
 #include "SysApAppUi.h"
 #include <settingsinternalcrkeys.h>
-#include <LogsDomainCRKeys.h>
+//#include <LogsDomainCRKeys.h>
 #include <logcli.h>
 #include <centralrepository.h>
 const TInt KPSetDefaultCFTimer = 30;
@@ -71,6 +71,12 @@
 
 void CSysApSimChanged::ClearRepositoriesL()
     {
+    const TUid KCRUidLogs = {0x101F874E};
+    /**
+    * Informs the Logs application about the amount of new missed calls.
+    * Integer type
+    **/
+    const TUint32 KLogsNewMissedCalls = 0x00000006;
     TRACES( RDebug::Print( _L("CSysApSimChanged::ClearRepositoriesL(): opening KCRUidCallForwarding") ) );
     
     CRepository* repository = CRepository::NewL( KCRUidCallForwarding );
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/SysAp/Src/SysApStartupController.cpp
--- a/coreapplicationuis/SysAp/Src/SysApStartupController.cpp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/SysAp/Src/SysApStartupController.cpp	Fri Apr 16 15:08:06 2010 +0300
@@ -20,7 +20,7 @@
 
 #include <startupdomainpskeys.h>
 #include <startupdomaincrkeys.h>
-#include "CoreApplicationUIsPrivateCRKeys.h"
+#include "coreapplicationuisprivatecrkeys.h"
 #include <hwrmpowerstatesdkpskeys.h>
 #include "SysApStartupController.h"
 #include "SysApAppUi.h"
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/SysAp/Src/Usb/Distribution.Policy.S60
--- a/coreapplicationuis/SysAp/Src/Usb/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/SysAp/Src/memorycard/Distribution.Policy.S60
--- a/coreapplicationuis/SysAp/Src/memorycard/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/SysAp/Src/powersavemode/Distribution.Policy.S60
--- a/coreapplicationuis/SysAp/Src/powersavemode/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/SysAp/conf/Distribution.Policy.S60
--- a/coreapplicationuis/SysAp/conf/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/SysAp/loc/Distribution.Policy.S60
--- a/coreapplicationuis/SysAp/loc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/SysAp/rom/Distribution.Policy.S60
--- a/coreapplicationuis/SysAp/rom/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/VariatedSettings/Distribution.Policy.S60
--- a/coreapplicationuis/VariatedSettings/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/VariatedSettings/group/Distribution.Policy.S60
--- a/coreapplicationuis/VariatedSettings/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/VariatedSettings/group/bld.inf
--- a/coreapplicationuis/VariatedSettings/group/bld.inf	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/VariatedSettings/group/bld.inf	Fri Apr 16 15:08:06 2010 +0300
@@ -26,33 +26,33 @@
 ../rom/VariatedSettings_variant.iby     CUSTOMER_MW_LAYER_IBY_EXPORT_PATH(VariatedSettings_variant.iby)
 
 // Normal RFS script
-../scripts/script0.txt /epoc32/release/winscw/udeb/z/private/100059C9/script0.txt
-../scripts/script0.txt /epoc32/release/winscw/urel/z/private/100059C9/script0.txt
-../scripts/script0.txt /epoc32/release/thumb/udeb/z/private/100059C9/script0.txt
-../scripts/script0.txt /epoc32/release/thumb/urel/z/private/100059C9/script0.txt
-../scripts/script0.txt /epoc32/release/arm4/udeb/z/private/100059C9/script0.txt
-../scripts/script0.txt /epoc32/release/arm4/urel/z/private/100059C9/script0.txt
-../scripts/script0.txt /epoc32/release/armv5/udeb/z/private/100059C9/script0.txt
-../scripts/script0.txt /epoc32/release/armv5/urel/z/private/100059C9/script0.txt
+../scripts/script0.txt /epoc32/release/winscw/udeb/z/private/100059c9/script0.txt
+../scripts/script0.txt /epoc32/release/winscw/urel/z/private/100059c9/script0.txt
+../scripts/script0.txt /epoc32/release/thumb/udeb/z/private/100059c9/script0.txt
+../scripts/script0.txt /epoc32/release/thumb/urel/z/private/100059c9/script0.txt
+../scripts/script0.txt /epoc32/release/arm4/udeb/z/private/100059c9/script0.txt
+../scripts/script0.txt /epoc32/release/arm4/urel/z/private/100059c9/script0.txt
+../scripts/script0.txt /epoc32/release/armv5/udeb/z/private/100059c9/script0.txt
+../scripts/script0.txt /epoc32/release/armv5/urel/z/private/100059c9/script0.txt
 
 // Deep RFS script
-../scripts/script1.txt /epoc32/release/winscw/udeb/z/private/100059C9/script1.txt
-../scripts/script1.txt /epoc32/release/winscw/urel/z/private/100059C9/script1.txt
-../scripts/script1.txt /epoc32/release/thumb/udeb/z/private/100059C9/script1.txt
-../scripts/script1.txt /epoc32/release/thumb/urel/z/private/100059C9/script1.txt
-../scripts/script1.txt /epoc32/release/arm4/udeb/z/private/100059C9/script1.txt
-../scripts/script1.txt /epoc32/release/arm4/urel/z/private/100059C9/script1.txt
-../scripts/script1.txt /epoc32/release/armv5/udeb/z/private/100059C9/script1.txt
-../scripts/script1.txt /epoc32/release/armv5/urel/z/private/100059C9/script1.txt
+../scripts/script1.txt /epoc32/release/winscw/udeb/z/private/100059c9/script1.txt
+../scripts/script1.txt /epoc32/release/winscw/urel/z/private/100059c9/script1.txt
+../scripts/script1.txt /epoc32/release/thumb/udeb/z/private/100059c9/script1.txt
+../scripts/script1.txt /epoc32/release/thumb/urel/z/private/100059c9/script1.txt
+../scripts/script1.txt /epoc32/release/arm4/udeb/z/private/100059c9/script1.txt
+../scripts/script1.txt /epoc32/release/arm4/urel/z/private/100059c9/script1.txt
+../scripts/script1.txt /epoc32/release/armv5/udeb/z/private/100059c9/script1.txt
+../scripts/script1.txt /epoc32/release/armv5/urel/z/private/100059c9/script1.txt
 
 // Init RFS script
-../scripts/ScriptInit.txt /epoc32/release/winscw/udeb/z/private/100059C9/ScriptInit.txt
-../scripts/ScriptInit.txt /epoc32/release/winscw/urel/z/private/100059C9/ScriptInit.txt
-../scripts/ScriptInit.txt /epoc32/release/thumb/udeb/z/private/100059C9/ScriptInit.txt
-../scripts/ScriptInit.txt /epoc32/release/thumb/urel/z/private/100059C9/ScriptInit.txt
-../scripts/ScriptInit.txt /epoc32/release/arm4/udeb/z/private/100059C9/ScriptInit.txt
-../scripts/ScriptInit.txt /epoc32/release/arm4/urel/z/private/100059C9/ScriptInit.txt
-../scripts/ScriptInit.txt /epoc32/release/armv5/udeb/z/private/100059C9/ScriptInit.txt
-../scripts/ScriptInit.txt /epoc32/release/armv5/urel/z/private/100059C9/ScriptInit.txt
+../scripts/ScriptInit.txt /epoc32/release/winscw/udeb/z/private/100059c9/scriptinit.txt
+../scripts/ScriptInit.txt /epoc32/release/winscw/urel/z/private/100059c9/scriptinit.txt
+../scripts/ScriptInit.txt /epoc32/release/thumb/udeb/z/private/100059c9/scriptinit.txt
+../scripts/ScriptInit.txt /epoc32/release/thumb/urel/z/private/100059c9/scriptinit.txt
+../scripts/ScriptInit.txt /epoc32/release/arm4/udeb/z/private/100059c9/scriptinit.txt
+../scripts/ScriptInit.txt /epoc32/release/arm4/urel/z/private/100059c9/scriptinit.txt
+../scripts/ScriptInit.txt /epoc32/release/armv5/udeb/z/private/100059c9/scriptinit.txt
+../scripts/ScriptInit.txt /epoc32/release/armv5/urel/z/private/100059c9/scriptinit.txt
 
 PRJ_MMPFILES
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/VariatedSettings/rom/Distribution.Policy.S60
--- a/coreapplicationuis/VariatedSettings/rom/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/VariatedSettings/scripts/Distribution.Policy.S60
--- a/coreapplicationuis/VariatedSettings/scripts/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/accfwuinotifier/Distribution.Policy.S60
--- a/coreapplicationuis/accfwuinotifier/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/accfwuinotifier/data/Distribution.Policy.S60
--- a/coreapplicationuis/accfwuinotifier/data/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/accfwuinotifier/group/Distribution.Policy.S60
--- a/coreapplicationuis/accfwuinotifier/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/accfwuinotifier/group/accfwuinotifier.mmp
--- a/coreapplicationuis/accfwuinotifier/group/accfwuinotifier.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/accfwuinotifier/group/accfwuinotifier.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2002-2010 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"
@@ -28,11 +28,17 @@
 
 CAPABILITY      CAP_ECOM_PLUGIN
 
+
+
+
+
+SYSTEMINCLUDE		/epoc32/include/mw/hb/hbwidgets
+
 SOURCEPATH      ../src
 
 SOURCE          AccFwUiNotifierProxy.cpp
 SOURCE          AccFwUiNoteNotifier.cpp
-SOURCE          AccFwUiDialogNotifier.cpp
+//SOURCE          AccFwUiDialogNotifier.cpp
 						
 USERINCLUDE     ../inc
 
@@ -52,14 +58,15 @@
 LIBRARY         euser.lib
 LIBRARY         eiksrv.lib
 LIBRARY	        efsrv.lib
-LIBRARY         FeatMgr.lib
+LIBRARY         featmgr.lib
 LIBRARY         eikdlg.lib
-LIBRARY         Avkon.lib
-LIBRARY			bafl.lib
-LIBRARY 		cone.lib
-
+LIBRARY		bafl.lib
+LIBRARY 	cone.lib
+//hb
+LIBRARY         HbWidgets.lib
 
 MACRO           API_TRACE_FLAG
 MACRO           COMPONENT_TRACE_FLAG
 
 // End of file
+
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/accfwuinotifier/inc/AccFwUiNoteNotifier.h
--- a/coreapplicationuis/accfwuinotifier/inc/AccFwUiNoteNotifier.h	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/accfwuinotifier/inc/AccFwUiNoteNotifier.h	Fri Apr 16 15:08:06 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2002-2010 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"
@@ -23,6 +23,8 @@
 #include <e32std.h>
 #include <e32base.h>
 #include <eiknotapi.h>
+#include <eikenv.h>
+
 
 // CONSTANTS
 const TUid KAccFwUiNoteNotifierUid = { 0x10205061 };
@@ -32,7 +34,7 @@
 
 // FORWARD DECLARATIONS
 class CCoeEnv;
-class CAknNoteDialog;
+
 
 // CLASS DECLARATION
 /**
@@ -97,13 +99,13 @@
 		RMessagePtr2 iMessage;
         // Indication whether notifier cancelled
         TBool iIsCancelled;
-	    // Note
-        CAknNoteDialog* iNote;
+	    
 	    // Indication whether to show not supported note in cover display
         TBool iPublishNote;
 	    // Text to show in note
         HBufC* iNoteText;
-
+        
+       
     };
 
 #endif      // __CACCFWUINOTENOTIFIER_H
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/accfwuinotifier/inc/Distribution.Policy.S60
--- a/coreapplicationuis/accfwuinotifier/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/accfwuinotifier/loc/Distribution.Policy.S60
--- a/coreapplicationuis/accfwuinotifier/loc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/accfwuinotifier/rom/Distribution.Policy.S60
--- a/coreapplicationuis/accfwuinotifier/rom/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/accfwuinotifier/src/AccFwUiNoteNotifier.cpp
--- a/coreapplicationuis/accfwuinotifier/src/AccFwUiNoteNotifier.cpp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/accfwuinotifier/src/AccFwUiNoteNotifier.cpp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2002-2010 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"
@@ -20,10 +20,9 @@
 #include <featmgr.h>
 #include <accfwnoteuinotifier.rsg>
 #include <data_caging_path_literals.hrh> 
-#include <aknnotewrappers.h>
-#include <SecondaryDisplay/SecondaryDisplayAccFwAPI.h>
+#include <secondarydisplay/secondarydisplayaccfwapi.h>
 #include <bautils.h>
-
+#include <hbdevicemessageboxsymbian.h>
 #include "AccFwUiNoteNotifier.h"
 #include "acc_debug.h"
 
@@ -68,7 +67,7 @@
     {
     API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::~CAccFwUiNoteNotifier()" );
 
-    delete iNote;
+  //  delete iNote;
     delete iNoteText;
     CActive::Cancel();
     
@@ -211,144 +210,7 @@
 
     if ( aBuffer.Length() )
         {
-		API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - Default accessory selection or headphones information" );
-
-    	TInt value( 0 );
-    	TPckg<TInt> pckg( value );
-    	pckg.Copy( aBuffer );
-
-   		//get "default enhancement" string resource
-		API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - Read default enhancement string" );
-        defaultText = iCoeEnv->AllocReadResourceLC( R_TEXT_DEFAULT_ENHANC );
-
-  		TPtrC enhancement;
-  		TBool enhancementOk( ETrue );
-
-  		if ( value != 0 )
-  		    {
-			API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - Default selection" );
-
-  			enhancementOk = EFalse;
-            HBufC8* literals = iCoeEnv->AllocReadResourceAsDes8L( R_SELECTION_DIALOG_LITERALS );
-            TResourceReader reader;
-        	reader.SetBuffer( literals );
-
-			TInt count( reader.ReadInt16() );
-			API_TRACE_1( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - Read literals, count %d", count );
-
-			// Find correct accessory literal
-			for ( TInt i = 0; i < count; i++ )
-			    {
-				//read from resource
-				TUint32 index( reader.ReadUint32() );
-				API_TRACE_1( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - Read literal, index %d", index );
-
-				if ( index == value )
-				    {
-					API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - Literal found!" );
-					// Literal found
-					enhancement.Set( reader.ReadTPtrC() );
-					enhancementOk = ETrue;
-					break;
-				    }
-				else
-				    {
-					API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - Not found!" );
-					reader.ReadTPtrC();
-				    }
-			    }
-			    
-			delete literals;
-  		    }
-
-		if ( enhancementOk )
-		    {
-			API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - Enhancement OK!" );
-			HBufC* noteStr = NULL;
-
-			// Headphones...
-			if ( value == 0x08 || value == 0x40 || value == 0 )
-			    {
-				API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - Show headphones information!" );
-
-				// Default enhancement string if needed
-				if ( value != 0 )
-				    {
-					API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - Show also default information!" );
-				 	noteStr = HBufC::NewL( defaultText->Length() + enhancement.Length() + 3 );
-
-				 	TPtr ptr( noteStr->Des() );	
-					ptr.Append( defaultText->Des() );
-					ptr.Append( ' ' );
-					ptr.Append( enhancement );
-					API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - Default string ready!" );
-				    }
-
-				API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - Read use phone mic string!" );
-                // Read resource use phone mic and default enhancement text...
-		   	    HBufC* usePhoneMicTextHolder = iCoeEnv->AllocReadResourceLC( R_TEXT_HEADPHONES_MIC );
-				
-				TBool chekcNoteStr( EFalse );
-				if ( noteStr )
-				    {
-					API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - Add phone mic string to default accessory string!" );
-					CleanupStack::PushL( noteStr );
-					HBufC* temp = noteStr->ReAllocL( noteStr->Length() + 2 + usePhoneMicTextHolder->Length() + 1 );
-					CleanupStack::Pop( noteStr );
-					noteStr = temp;
-					chekcNoteStr = ETrue;
-					}
-				else
-				    {
-					API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - Only use phone mic string!" );
-					noteStr = HBufC::NewL( usePhoneMicTextHolder->Length() + 1 );
-				    }
-
-			 	TPtr ptr( noteStr->Des() );	
-				
-				
-				if( chekcNoteStr )
-					{
-					ptr.Append( _L( ". " ) );
-					ptr.Append( usePhoneMicTextHolder->Des() );
-					}
-                else
-                	{
-                	ptr.Append( usePhoneMicTextHolder->Des() );
-                	}
-                // Cleanup
-                CleanupStack::PopAndDestroy( usePhoneMicTextHolder );
-
-				API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - String ready!" );
-			    }
-			else
-			    {
-				API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - Create default accessory text!" );
-				//only default accessory text
-				noteStr = HBufC::NewL( defaultText->Length() + enhancement.Length() + 1 );
-            	TPtr ptr( noteStr->Des() );
-			
-				ptr.Append( defaultText->Des() );
-				ptr.Append( ' ' );
-				ptr.Append( enhancement );
-				API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - Default accessory text ready!" );
-			    }
-
-            // Pass string to member string and free local copies
-            CleanupStack::PopAndDestroy( defaultText );
-            CleanupStack::PushL( noteStr );
-            iNoteText = HBufC::NewL( noteStr->Length() );
-            TPtr ptr( iNoteText->Des() );
-            ptr.Append( noteStr->Des() );
-            CleanupStack::PopAndDestroy( noteStr );
-            showNote = ETrue;
-		    }
-		else
-		    {
-			API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - No note" );
-            // No need to check this one, always set into cleanup stack
-            CleanupStack::PopAndDestroy( defaultText );
-            }
+		//Do nothing as accessory is rightly detected by accessory server and adaptation.
         }
     else
         {
@@ -398,25 +260,13 @@
 		return;	
 	    }
     
-    // Create note
-    iNote = new ( ELeave ) CAknNoteDialog(
-        CAknNoteDialog::ENoTone,
-        CAknNoteDialog::ELongTimeout );
-
-    iNote->PrepareLC( R_ACCFWUINOTIFIER_INFORMATION_NOTE ); // Adds to CleanupStack
-
-    if ( iPublishNote )
-        {
-        iNote->PublishDialogL( ECmdShowAccessoryNotSupportedNote, KCatAccFw );
-        iPublishNote = EFalse;
-        }
-
-    iNote->SetTextL( *iNoteText );
-    API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - iNote->RunLD()!" );
-    iNote->RunLD();
-    iNote = NULL;
-    delete iNoteText;
-    iNoteText = NULL;
+   	CHbDeviceMessageBoxSymbian *messageBox = CHbDeviceMessageBoxSymbian::NewL(CHbDeviceMessageBoxSymbian::EInformation);
+	           CleanupStack::PushL(messageBox);
+	           messageBox->SetTextL(*iNoteText);
+	           messageBox->ShowL();
+	           CleanupStack::PopAndDestroy(messageBox); // messageBox
+	           delete iNoteText;
+	           iNoteText = NULL;
 
     API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::RunL() - Complete message" );
 	iMessage.Complete( KErrNone );
@@ -465,21 +315,17 @@
 
     iIsCancelled = ETrue;
     
-    if ( iNote )
-        {
-	   // Cancel active object, delete dialog and free resources
+    	   // Cancel active object, delete dialog and free resources
         if ( IsActive() )
             {
             CActive::Cancel();    
             }
-	    delete iNote;
-	    iNote = NULL;
-        delete iNoteText;
+	      delete iNoteText;
         iNoteText = NULL;
 
         API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::Cancel() - Complete message with Cancel" );
         iMessage.Complete( KErrCancel );
-        }
+       
 
     API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::Cancel() - return" );
     }
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/accfwuinotifier/src/AccFwUiNotifierProxy.cpp
--- a/coreapplicationuis/accfwuinotifier/src/AccFwUiNotifierProxy.cpp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/accfwuinotifier/src/AccFwUiNotifierProxy.cpp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002-2004 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2002-2010 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"
@@ -30,7 +30,7 @@
 
 // CONSTANTS
 
-const TInt KNumberOfImplementations(2);
+const TInt KNumberOfImplementations(1);
 
 // MACROS
 
@@ -51,15 +51,10 @@
     API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CreateNotifiersL() - enter" );
     MEikSrvNotifierBase2* note = CAccFwUiNoteNotifier::NewL();
     CleanupStack::PushL( note );
-    
-    MEikSrvNotifierBase2* dialog = CAccFwUiDialogNotifier::NewL();
-    CleanupStack::PushL( dialog );        
-    
+          
     aSubjects->AppendL( note );
-    aSubjects->AppendL( dialog );
-    
-    CleanupStack::Pop( dialog );
-    CleanupStack::Pop( note );
+     
+      CleanupStack::Pop( note );
     API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CreateNotifiersL() - return void" );
     
     }
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/accfwuinotifier/src/Distribution.Policy.S60
--- a/coreapplicationuis/accfwuinotifier/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/advancedtspcontroller/Distribution.Policy.S60
--- a/coreapplicationuis/advancedtspcontroller/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/advancedtspcontroller/data/Distribution.Policy.S60
--- a/coreapplicationuis/advancedtspcontroller/data/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/advancedtspcontroller/data/keyevent.rul
--- a/coreapplicationuis/advancedtspcontroller/data/keyevent.rul	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/advancedtspcontroller/data/keyevent.rul	Fri Apr 16 15:08:06 2010 +0300
@@ -22,9 +22,9 @@
             />
             
             <Tsp
-            routingTable='01'
+            routingTable='01'            
+            ruleForeground='01'
             ruleActiveAudio='00'
-            ruleForeground='01'
             ruleLastPlayedAudio='03'
             ruleDefaultApp='02'
             defaultApplicationPhone='100058B3'
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/advancedtspcontroller/group/Distribution.Policy.S60
--- a/coreapplicationuis/advancedtspcontroller/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/advancedtspcontroller/group/RemConTspController.mmp
--- a/coreapplicationuis/advancedtspcontroller/group/RemConTspController.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/advancedtspcontroller/group/RemConTspController.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -19,7 +19,7 @@
 #include <remcon/remconservercaps.mmh> // RemCon has defined capabilities
 #include <platform_paths.hrh>
 
-TARGET          AdvancedTspController.dll
+TARGET          advancedtspcontroller.dll
 TARGETTYPE      PLUGIN
 UID             0x10009d8d 0x10282CD5
 
@@ -32,7 +32,7 @@
 SOURCE          remconeventtable.cpp
 
 START RESOURCE  ../data/10282CD5.rss
-target          AdvancedTspController.rsc
+target          advancedtspcontroller.rsc
 END
 
 USERINCLUDE     ../inc
@@ -46,8 +46,8 @@
 LIBRARY         apparc.lib
 LIBRARY         remcontargetselectorplugin.lib
 LIBRARY         remcontypes.lib
-LIBRARY         CFClient.lib
-LIBRARY         CFServices.lib
+LIBRARY         cfclient.lib
+LIBRARY         cfservices.lib
 LIBRARY         ws32.lib
 LIBRARY         apgrfx.lib
 LIBRARY         tspclientmapper.lib
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/advancedtspcontroller/group/bld.inf
--- a/coreapplicationuis/advancedtspcontroller/group/bld.inf	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/advancedtspcontroller/group/bld.inf	Fri Apr 16 15:08:06 2010 +0300
@@ -27,14 +27,14 @@
 
 #ifdef RD_TSP_CLIENT_MAPPER
 // Rules for media key handling
-../data/keyevent.rul                                        	    /epoc32/data/Z/private/10282bc4/rules/keyevent.rul
-../data/keyevent.rul                                        	    /epoc32/RELEASE/winscw/UDEB/Z/private/10282BC4/Rules/keyevent.rul
+../data/keyevent.rul                                        	    /epoc32/data/z/private/10282bc4/rules/keyevent.rul
+../data/keyevent.rul                                        	    /epoc32/release/winscw/udeb/z/private/10282bc4/rules/keyevent.rul
 // Call handling rules
-../data/keyincall.rul                               	            /epoc32/data/Z/private/10282bc4/rules/keyincall.rul
-../data/keyincall.rul                               	            /epoc32/RELEASE/winscw/UDEB/Z/private/10282BC4/Rules/keyincall.rul
+../data/keyincall.rul                               	            /epoc32/data/z/private/10282bc4/rules/keyincall.rul
+../data/keyincall.rul                               	            /epoc32/release/winscw/udeb/z/private/10282bc4/rules/keyincall.rul
 // FM transmitter handling rules
-../data/keyinfmtx.rul                               	            /epoc32/data/Z/private/10282bc4/rules/keyinfmtx.rul
-../data/keyinfmtx.rul                               	            /epoc32/RELEASE/winscw/UDEB/Z/private/10282BC4/Rules/keyinfmtx.rul
+../data/keyinfmtx.rul                               	            /epoc32/data/z/private/10282bc4/rules/keyinfmtx.rul
+../data/keyinfmtx.rul                               	            /epoc32/release/winscw/udeb/z/private/10282bc4/rules/keyinfmtx.rul
 ../rom/advancedtspcontroller.iby CORE_MW_LAYER_IBY_EXPORT_PATH(advancedtspcontroller.iby)
 
 PRJ_MMPFILES
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/advancedtspcontroller/inc/Distribution.Policy.S60
--- a/coreapplicationuis/advancedtspcontroller/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/advancedtspcontroller/rom/Distribution.Policy.S60
--- a/coreapplicationuis/advancedtspcontroller/rom/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/advancedtspcontroller/src/Distribution.Policy.S60
--- a/coreapplicationuis/advancedtspcontroller/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/advancedtspcontroller/tsrc/Distribution.Policy.S60
--- a/coreapplicationuis/advancedtspcontroller/tsrc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/BWINS/Distribution.Policy.S60
--- a/coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/BWINS/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/Distribution.Policy.S60
--- a/coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/EABI/Distribution.Policy.S60
--- a/coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/EABI/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/group/Distribution.Policy.S60
--- a/coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/inc/Distribution.Policy.S60
--- a/coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/src/Distribution.Policy.S60
--- a/coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/advancedtspcontroller/tsrc/stub/Distribution.Policy.S60
--- a/coreapplicationuis/advancedtspcontroller/tsrc/stub/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/advancedtspcontroller/tsrc/stub/data/Distribution.Policy.S60
--- a/coreapplicationuis/advancedtspcontroller/tsrc/stub/data/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/advancedtspcontroller/tsrc/stub/group/Distribution.Policy.S60
--- a/coreapplicationuis/advancedtspcontroller/tsrc/stub/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/group/Distribution.Policy.S60
--- a/coreapplicationuis/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/gsserverenginestub/Distribution.Policy.S60
--- a/coreapplicationuis/gsserverenginestub/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/gsserverenginestub/Inc/Distribution.Policy.S60
--- a/coreapplicationuis/gsserverenginestub/Inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/gsserverenginestub/Src/Distribution.Policy.S60
--- a/coreapplicationuis/gsserverenginestub/Src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/gsserverenginestub/bwins/Distribution.Policy.S60
--- a/coreapplicationuis/gsserverenginestub/bwins/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/gsserverenginestub/eabi/Distribution.Policy.S60
--- a/coreapplicationuis/gsserverenginestub/eabi/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/gsserverenginestub/group/Distribution.Policy.S60
--- a/coreapplicationuis/gsserverenginestub/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/gsserverenginestub/group/GSServerEnginestub.mmp
--- a/coreapplicationuis/gsserverenginestub/group/GSServerEnginestub.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/gsserverenginestub/group/GSServerEnginestub.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -19,7 +19,7 @@
 // To get the MW_LAYER_SYSTEMINCLUDE-definition
 #include <platform_paths.hrh>
 
-TARGET                  GSServerEnginestub.dll
+TARGET                  gsserverenginestub.dll
 TARGETTYPE              dll
 UID                     0x10281F16
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/inc/Distribution.Policy.S60
--- a/coreapplicationuis/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/kefmapper/BWINS/distribution.policy.s60
--- a/coreapplicationuis/kefmapper/BWINS/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/kefmapper/Distribution.Policy.S60
--- a/coreapplicationuis/kefmapper/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/kefmapper/EABI/distribution.policy.s60
--- a/coreapplicationuis/kefmapper/EABI/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/kefmapper/data/Distribution.Policy.S60
--- a/coreapplicationuis/kefmapper/data/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/kefmapper/group/Distribution.Policy.S60
--- a/coreapplicationuis/kefmapper/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/kefmapper/group/KeyEventFw.mmp
--- a/coreapplicationuis/kefmapper/group/KeyEventFw.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/kefmapper/group/KeyEventFw.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -19,7 +19,7 @@
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
 
-TARGET          KeyEventFw.DLL
+TARGET          keyeventfw.dll
 TARGETTYPE      dll
 UID             0x1000008D 0x102824C2
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/kefmapper/inc/Distribution.Policy.S60
--- a/coreapplicationuis/kefmapper/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/kefmapper/rom/Distribution.Policy.S60
--- a/coreapplicationuis/kefmapper/rom/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/kefmapper/src/Distribution.Policy.S60
--- a/coreapplicationuis/kefmapper/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/powersaveutilities/BWINS/Distribution.Policy.S60
--- a/coreapplicationuis/powersaveutilities/BWINS/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/powersaveutilities/BWINS/batterypopupcontrolu.DEF
--- a/coreapplicationuis/powersaveutilities/BWINS/batterypopupcontrolu.DEF	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/powersaveutilities/BWINS/batterypopupcontrolu.DEF	Fri Apr 16 15:08:06 2010 +0300
@@ -1,6 +1,6 @@
 EXPORTS
-	??1CBatteryPopupControl@@UAE@XZ @ 1 NONAME ; CBatteryPopupControl::~CBatteryPopupControl(void)
-	?NewL@CBatteryPopupControl@@SAPAV1@ABVTDesC16@@0@Z @ 2 NONAME ; class CBatteryPopupControl * CBatteryPopupControl::NewL(class TDesC16 const &, class TDesC16 const &)
-	?SetCommandObserver@CBatteryPopupControl@@QAEXAAVMEikCommandObserver@@@Z @ 3 NONAME ; void CBatteryPopupControl::SetCommandObserver(class MEikCommandObserver &)
-	?ShowPopUpL@CBatteryPopupControl@@QAEXXZ @ 4 NONAME ; void CBatteryPopupControl::ShowPopUpL(void)
+	?NewL@CBatteryPopupControl@@SAPAV1@ABVTDesC16@@0@Z @ 1 NONAME ; class CBatteryPopupControl * CBatteryPopupControl::NewL(class TDesC16 const &, class TDesC16 const &)
+	?SetCommandObserver@CBatteryPopupControl@@QAEXAAVMEikCommandObserver@@@Z @ 2 NONAME ; void CBatteryPopupControl::SetCommandObserver(class MEikCommandObserver &)
+	?ShowPopUpL@CBatteryPopupControl@@QAEXXZ @ 3 NONAME ; void CBatteryPopupControl::ShowPopUpL(void)
+	??1CBatteryPopupControl@@QAE@XZ @ 4 NONAME ; CBatteryPopupControl::~CBatteryPopupControl(void)
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/powersaveutilities/CenRep/Distribution.Policy.S60
--- a/coreapplicationuis/powersaveutilities/CenRep/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/powersaveutilities/Distribution.Policy.S60
--- a/coreapplicationuis/powersaveutilities/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/powersaveutilities/EABI/Distribution.Policy.S60
--- a/coreapplicationuis/powersaveutilities/EABI/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/powersaveutilities/EABI/batterypopupcontrolu.DEF
--- a/coreapplicationuis/powersaveutilities/EABI/batterypopupcontrolu.DEF	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/powersaveutilities/EABI/batterypopupcontrolu.DEF	Fri Apr 16 15:08:06 2010 +0300
@@ -2,7 +2,6 @@
 	_ZN20CBatteryPopupControl10ShowPopUpLEv @ 1 NONAME
 	_ZN20CBatteryPopupControl18SetCommandObserverER19MEikCommandObserver @ 2 NONAME
 	_ZN20CBatteryPopupControl4NewLERK7TDesC16S2_ @ 3 NONAME
-	_ZN20CBatteryPopupControlD0Ev @ 4 NONAME
-	_ZN20CBatteryPopupControlD1Ev @ 5 NONAME
-	_ZN20CBatteryPopupControlD2Ev @ 6 NONAME
+	_ZN20CBatteryPopupControlD1Ev @ 4 NONAME
+	_ZN20CBatteryPopupControlD2Ev @ 5 NONAME
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/powersaveutilities/batindicatorpaneplugin/Distribution.Policy.S60
--- a/coreapplicationuis/powersaveutilities/batindicatorpaneplugin/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/powersaveutilities/batindicatorpaneplugin/inc/Distribution.Policy.S60
--- a/coreapplicationuis/powersaveutilities/batindicatorpaneplugin/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/powersaveutilities/batindicatorpaneplugin/src/Distribution.Policy.S60
--- a/coreapplicationuis/powersaveutilities/batindicatorpaneplugin/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/powersaveutilities/batterypopupcontrol/Distribution.Policy.S60
--- a/coreapplicationuis/powersaveutilities/batterypopupcontrol/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/powersaveutilities/batterypopupcontrol/inc/Distribution.Policy.S60
--- a/coreapplicationuis/powersaveutilities/batterypopupcontrol/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/powersaveutilities/batterypopupcontrol/inc/batterypopupcontrol.h
--- a/coreapplicationuis/powersaveutilities/batterypopupcontrol/inc/batterypopupcontrol.h	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/powersaveutilities/batterypopupcontrol/inc/batterypopupcontrol.h	Fri Apr 16 15:08:06 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2007-2010 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"
@@ -19,10 +19,10 @@
 #ifndef CBATTERYPOPUPCONTROL_H
 #define CBATTERYPOPUPCONTROL_H
 
-#include <AknControl.h>
-#include <AknUtils.h>
-#include <AknPreviewPopUpController.h> // Controlling the preview pop-up component
-
+//#include <akncontrol.h>
+//#include <aknutils.h>
+//#include <aknpreviewpopupcontroller.h> // Controlling the preview pop-up component
+#include<coecobs.h>
 class MEikCommandObserver; 
 class CEikLabel;
 class CGulIcon;
@@ -42,10 +42,9 @@
 *  @lib BatteryPopupControl.lib
 *  @since S60 5.0
 */
-NONSHARABLE_CLASS( CBatteryPopupControl ) :
-    public CAknControl,
-    public MCoeControlObserver,
-    public MAknPreviewPopUpObserver
+NONSHARABLE_CLASS( CBatteryPopupControl ) :public MCoeControlObserver
+   // public CAknControl,
+       // public MAknPreviewPopUpObserver
     {
 public:
     
@@ -134,8 +133,8 @@
     /**
      * @see MAknPreviewPopUpObserver
      */
-    void HandlePreviewPopUpEventL( CAknPreviewPopUpController* aController,
-                                   TPreviewPopUpEvent aEvent );     
+ //   void HandlePreviewPopUpEventL( CAknPreviewPopUpController* aController,
+ //                                  TPreviewPopUpEvent aEvent );     
 
     /**
      * Default constructor.
@@ -159,8 +158,8 @@
      * @param aParent Parent rect.
      * @param aComponentLayout Layout data.
      */
-    TRect RectFromLayout( const TRect& aParent,
-        const TAknWindowComponentLayout& aComponentLayout ) const;
+ //   TRect RectFromLayout( const TRect& aParent,
+ //       const TAknWindowComponentLayout& aComponentLayout ) const;
 
     /**
      * Gets rect from layout data.
@@ -168,8 +167,8 @@
      * @since S60 5.0
      * @param aComponentLayout Layout data.
      */
-    TRect PopUpWindowRectFromLayout( const TAknWindowComponentLayout&
-        aComponentLayout ) const;
+ //   TRect PopUpWindowRectFromLayout( const TAknWindowComponentLayout&
+ //       aComponentLayout ) const;
     
     /**
      * Creates CGulIcon.
@@ -271,7 +270,7 @@
     /**
      * Layout for icon  
      */
-    TAknLayoutRect iBitmapLayout;  
+  //  TAknLayoutRect iBitmapLayout;  
 
     /**
      * Variant, 
@@ -284,7 +283,7 @@
      * Popup controller
      * Own.  
      */    
-    CAknPreviewPopUpController* iController;
+  //  CAknPreviewPopUpController* iController;
     
     /**
      * Rect for link  
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/powersaveutilities/batterypopupcontrol/src/Distribution.Policy.S60
--- a/coreapplicationuis/powersaveutilities/batterypopupcontrol/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/powersaveutilities/batterypopupcontrol/src/batterypopupcontrol.cpp
--- a/coreapplicationuis/powersaveutilities/batterypopupcontrol/src/batterypopupcontrol.cpp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/powersaveutilities/batterypopupcontrol/src/batterypopupcontrol.cpp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2007-2010 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"
@@ -16,17 +16,17 @@
 */
 
 
-#include <AknUtils.h>
-#include <AknPanic.h>
-#include <AknPreviewPopUpController.h>
-#include <aknglobalpopupprioritycontroller.h>
+//#include <aknutils.h>
+//#include <aknpanic.h>
+//#include <aknpreviewpopupcontroller.h>
+//#include <aknglobalpopupprioritycontroller.h>
 #include <barsread.h> // TResourceReader
 #include <eiklabel.h>
 #include <fbs.h>
-#include <aknappui.h>
-#include <aknlayoutscalable_avkon.cdl.h>
-#include <AknsDrawUtils.h>
-#include <AknBidiTextUtils.h>
+//#include <aknappui.h>
+//#include <aknlayoutscalable_avkon.cdl.h>
+//#include <aknsdrawutils.h>
+//#include <aknbiditextutils.h>
 #include <data_caging_path_literals.hrh> // KDC_RESOURCE_FILES_DIR
 #include <batterypopupcontrol.mbg>
 // ----------- Touch feedback additions start
@@ -39,9 +39,9 @@
 #include "trace.h"
 
 // Constants
-const TInt KPopupShowDelay = 0;       // Show immediately
-const TInt KPopupHideDelay = 3000000; // hide after 3 sec
-const TInt KMaxLinkTextLength = 255;
+//const TInt KPopupShowDelay = 0;       // Show immediately
+//const TInt KPopupHideDelay = 3000000; // hide after 3 sec
+//const TInt KMaxLinkTextLength = 255;
 
 // ======== MEMBER FUNCTIONS ========
 
@@ -80,7 +80,7 @@
 EXPORT_C CBatteryPopupControl::~CBatteryPopupControl()
     {  
     FUNC_LOG   
-    delete iController;
+  //  delete iController;
     delete iText;
     delete iIcon;
     delete iLinkText;
@@ -105,7 +105,7 @@
     {    
     FUNC_LOG
     
-    iController = CAknPreviewPopUpController::NewL( *this, CAknPreviewPopUpController::ELayoutDefault | CAknPreviewPopUpController::EDontClose );            
+ /*   iController = CAknPreviewPopUpController::NewL( *this, CAknPreviewPopUpController::ELayoutDefault | CAknPreviewPopUpController::EDontClose );            
     iController->AddObserverL( *this );
     
     // Set popup's hide/show delays
@@ -121,7 +121,7 @@
         }
 		
     // Launch
-    iController->ShowPopUp();  
+    iController->ShowPopUp();  */
     }
 
 // -----------------------------------------------------------------------------
@@ -134,11 +134,11 @@
     {
     FUNC_LOG
     	
-    CCoeControl::HandleResourceChange( aType );
+   /* CCoeControl::HandleResourceChange( aType );
     if ( aType == KEikDynamicLayoutVariantSwitch )
         {
         SizeChanged();
-        }
+        }*/
     }
 
 
@@ -152,7 +152,7 @@
     {
     FUNC_LOG
     	
-    CCoeControl::SetContainerWindowL( aContainer );
+ //   CCoeControl::SetContainerWindowL( aContainer );
     
     if( iText )
         {
@@ -175,9 +175,10 @@
 // From MAknPreviewPopUpObserver
 // ---------------------------------------------------------------------------
 //
+/*
 void CBatteryPopupControl::HandlePreviewPopUpEventL(
-    CAknPreviewPopUpController* /*aController*/,
-    TPreviewPopUpEvent aEvent )
+    CAknPreviewPopUpController aController,
+   TPreviewPopUpEvent aEvent )
     {
     FUNC_LOG
 
@@ -191,7 +192,7 @@
             break;
         }
     }
-    
+    */
 // -----------------------------------------------------------------------------
 // CAknStylusActivatedPopUpContent::ConstructL
 // -----------------------------------------------------------------------------
@@ -217,7 +218,7 @@
             }      
         iLinkText = aLinkText.AllocL(); 
         }
-        
+ /*       
     TRect rectPopUpWindow = PopUpWindowRectFromLayout( 
         AknLayoutScalable_Avkon::popup_battery_window( iVariant ) );
       
@@ -230,9 +231,9 @@
         AknLayoutScalable_Avkon::popup_battery_window_t1( iVariant );
     TAknLayoutText textRect;
     textRect.LayoutText( rectPopUpWindow, textLayout );
-    
+    */
     // Font for command links
-    iFont = textRect.Font();    
+  //  iFont = textRect.Font();    
     }
     
 // -----------------------------------------------------------------------------
@@ -254,8 +255,8 @@
                 }
             }        
         default:
-            __ASSERT_ALWAYS( aIndex >= 0, User::Panic( 
-                _L("CBatteryPopupControl::ComponentControl"), EAknPanicOutOfRange ) );
+         //   __ASSERT_ALWAYS( aIndex >= 0, User::Panic( 
+          //      _L("CBatteryPopupControl::ComponentControl"), EAknPanicOutOfRange ) );
             return NULL;
         }        
     }
@@ -289,7 +290,7 @@
     {
     FUNC_LOG
       	
-    CWindowGc& gc = SystemGc();
+ /*   CWindowGc& gc = SystemGc();
     MAknsSkinInstance* skin = AknsUtils::SkinInstance();
     
     if( iIcon )
@@ -375,7 +376,7 @@
         gc.DrawText( ptr, rect, baselineOffset, 
             CGraphicsContext::ELeft );
         delete visualText; 
-        }
+        }*/
     }
 
 
@@ -406,9 +407,9 @@
         TInt tempWidth = iFont->TextWidthInPixels( *( iLinkText ) );
         minWidth = Max( minWidth, tempWidth );
         }
-    TInt rectWidth = 0;
+  //  TInt rectWidth = 0;
     
-    TAknWindowComponentLayout infoPaneLayout = 
+/*    TAknWindowComponentLayout infoPaneLayout = 
         AknLayoutScalable_Avkon::bg_popup_sub_pane_cp25( iVariant );
                
     TRect rectPopUpWindow =  PopUpWindowRectFromLayout( 
@@ -418,9 +419,9 @@
     
     rectWidth = Max( rectInfoPane.Width(), minWidth ); 
     
-    TInt rectHeight = rectInfoPane.Height();
+    TInt rectHeight = rectInfoPane.Height();*/
    
-    return TSize( rectWidth, rectHeight ); 
+ //   return TSize( rectWidth, rectHeight ); 
     }
 
 
@@ -433,7 +434,7 @@
     {
     FUNC_LOG 	
     // Get popup window rect
-    TRect rectPopUpWindow =  PopUpWindowRectFromLayout( 
+ /*   TRect rectPopUpWindow =  PopUpWindowRectFromLayout( 
         AknLayoutScalable_Avkon::bg_popup_sub_pane_cp25( iVariant ) );
     
     // Get pane icon and text layouts
@@ -486,27 +487,27 @@
             }
         tempRect.SetWidth( tempWidth );
         iLinkRect = tempRect;
-        }
+        }*/
     }
 
 // -----------------------------------------------------------------------------
 // RectFromLayout
 // -----------------------------------------------------------------------------
 //
-TRect CBatteryPopupControl::RectFromLayout( const TRect& aParent,
+/*TRect CBatteryPopupControl::RectFromLayout( const TRect& aParent,
         const TAknWindowComponentLayout& aComponentLayout ) const
     {
     TAknWindowLineLayout lineLayout = aComponentLayout.LayoutLine();
     TAknLayoutRect layoutRect;
     layoutRect.LayoutRect( aParent, lineLayout );
     return layoutRect.Rect();
-    }
+    }*/
 
 // -----------------------------------------------------------------------------
 // PopUpWindowRectFromLayout
 // -----------------------------------------------------------------------------
 //
-TRect CBatteryPopupControl::PopUpWindowRectFromLayout( const
+/*TRect CBatteryPopupControl::PopUpWindowRectFromLayout( const
     TAknWindowComponentLayout& aComponentLayout ) const
     {
     FUNC_LOG          
@@ -519,7 +520,7 @@
     layoutRect.LayoutRect( iAvkonAppUi->ApplicationRect(), lineLayout );
 
     return layoutRect.Rect();
-    }
+    }*/
    
 // -----------------------------------------------------------------------------
 // From class CCoeControl
@@ -537,7 +538,7 @@
             if ( !iHighlightedItem )
                 {         
                 iHighlightedItem = ETrue;             
-                DrawNow( iLinkRect );
+             //   DrawNow( iLinkRect );
                 }
 #ifdef RD_TACTILE_FEEDBACK
             if ( aPointerEvent.iType == TPointerEvent::EButton1Down )
@@ -553,7 +554,7 @@
             // Nofity command observer  
             if ( aPointerEvent.iType == TPointerEvent::EButton1Up )
                 {
-                iCommandObserver->ProcessCommandL( ELinkFirst );
+              //  iCommandObserver->ProcessCommandL( ELinkFirst );
                 iHighlightedItem = EFalse; 
                 }
             }
@@ -577,12 +578,12 @@
     delete iIcon;
     iIcon = NULL;
     
-    iIcon = AknsUtils::CreateGulIconL( AknsUtils::SkinInstance(),
+ /*   iIcon = AknsUtils::CreateGulIconL( AknsUtils::SkinInstance(),
                                        KAknsIIDQgnPropBatteryIcon,
                                        fp->FullName(),
                                        EMbmBatterypopupcontrolQgn_prop_battery_ps_deactivate,
                                        EMbmBatterypopupcontrolQgn_prop_battery_ps_deactivate_mask );
-
+*/
     CleanupStack::PopAndDestroy( fp );
     }      
 //  End of File
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/powersaveutilities/bsutil/Distribution.Policy.S60
--- a/coreapplicationuis/powersaveutilities/bsutil/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/powersaveutilities/bsutil/inc/Distribution.Policy.S60
--- a/coreapplicationuis/powersaveutilities/bsutil/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/powersaveutilities/bsutil/src/Distribution.Policy.S60
--- a/coreapplicationuis/powersaveutilities/bsutil/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/powersaveutilities/conf/distribution.policy.s60
--- a/coreapplicationuis/powersaveutilities/conf/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/powersaveutilities/data/Distribution.Policy.S60
--- a/coreapplicationuis/powersaveutilities/data/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/powersaveutilities/group/BSUtil.mmp
--- a/coreapplicationuis/powersaveutilities/group/BSUtil.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/powersaveutilities/group/BSUtil.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -18,7 +18,7 @@
 
 #include <platform_paths.hrh>
 
-TARGET          BSUtil.dll
+TARGET          bsutil.dll
 TARGETTYPE      dll
 
 UID             0x1000008D 0x2000B5E2 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/powersaveutilities/group/Distribution.Policy.S60
--- a/coreapplicationuis/powersaveutilities/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/powersaveutilities/group/batindicatorpaneplugin.mmp
--- a/coreapplicationuis/powersaveutilities/group/batindicatorpaneplugin.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/powersaveutilities/group/batindicatorpaneplugin.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -65,7 +65,7 @@
 LIBRARY     efsrv.lib               // TParsePtrC
 LIBRARY     flogger.lib
 LIBRARY     psmclient.lib
-LIBRARY     BSUtil.lib
+LIBRARY     bsutil.lib
 LIBRARY     batterypopupcontrol.lib
 LIBRARY     centralrepository.lib
 // End of File
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/powersaveutilities/group/batterypopupcontrol.mmp
--- a/coreapplicationuis/powersaveutilities/group/batterypopupcontrol.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/powersaveutilities/group/batterypopupcontrol.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -42,15 +42,15 @@
 LIBRARY   efsrv.lib               // TParsePtrC
 LIBRARY   flogger.lib
 LIBRARY   eikcoctl.lib
-LIBRARY   AknLayout2.lib
-LIBRARY   AknLayout2Scalable.lib
-LIBRARY   CdlEngine.lib
-LIBRARY   AknSkins.lib // Skins support
+LIBRARY   aknlayout2.lib
+LIBRARY   aknlayout2scalable.lib
+LIBRARY   cdlengine.lib
+LIBRARY   aknskins.lib // Skins support
 LIBRARY   gdi.lib
-LIBRARY   AknIcon.lib
+LIBRARY   aknicon.lib
 LIBRARY   egul.lib
-LIBRARY   FontProvider.lib
-LIBRARY   FontUtils.lib
+LIBRARY   fontprovider.lib
+LIBRARY   fontutils.lib
 #ifndef AVKON_BATTERYPOPUP_LAYOUTS
 LIBRARY   aknnotify.lib
 #endif //AVKON_BATTERYPOPUP_LAYOUTS
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/powersaveutilities/group/bld.inf
--- a/coreapplicationuis/powersaveutilities/group/bld.inf	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/powersaveutilities/group/bld.inf	Fri Apr 16 15:08:06 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2009-2010 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"
@@ -39,7 +39,7 @@
 PRJ_MMPFILES
 BSUtil.mmp
 batterypopupcontrol.mmp
-batindicatorpaneplugin.mmp
+//batindicatorpaneplugin.mmp
 
 PRJ_EXTENSIONS
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/powersaveutilities/loc/Distribution.Policy.S60
--- a/coreapplicationuis/powersaveutilities/loc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/powersaveutilities/rom/Distribution.Policy.S60
--- a/coreapplicationuis/powersaveutilities/rom/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/powersaveutilities/tsrc/distribution.policy.s60
--- a/coreapplicationuis/powersaveutilities/tsrc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/powersaveutilities/tsrc/public/adv/conf/distribution.policy.s60
--- a/coreapplicationuis/powersaveutilities/tsrc/public/adv/conf/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/powersaveutilities/tsrc/public/adv/data/distribution.policy.s60
--- a/coreapplicationuis/powersaveutilities/tsrc/public/adv/data/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/powersaveutilities/tsrc/public/adv/distribution.policy.s60
--- a/coreapplicationuis/powersaveutilities/tsrc/public/adv/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/powersaveutilities/tsrc/public/adv/group/distribution.policy.s60
--- a/coreapplicationuis/powersaveutilities/tsrc/public/adv/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/powersaveutilities/tsrc/public/adv/init/distribution.policy.s60
--- a/coreapplicationuis/powersaveutilities/tsrc/public/adv/init/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/powersaveutilities/tsrc/public/basic/BWINS/Distribution.Policy.S60
--- a/coreapplicationuis/powersaveutilities/tsrc/public/basic/BWINS/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/powersaveutilities/tsrc/public/basic/EABI/Distribution.Policy.S60
--- a/coreapplicationuis/powersaveutilities/tsrc/public/basic/EABI/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/powersaveutilities/tsrc/public/basic/MT_BSUtil/Distribution.Policy.S60
--- a/coreapplicationuis/powersaveutilities/tsrc/public/basic/MT_BSUtil/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/powersaveutilities/tsrc/public/basic/MT_BatteryPopupControl/Distribution.Policy.S60
--- a/coreapplicationuis/powersaveutilities/tsrc/public/basic/MT_BatteryPopupControl/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/powersaveutilities/tsrc/public/basic/conf/distribution.policy.s60
--- a/coreapplicationuis/powersaveutilities/tsrc/public/basic/conf/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/powersaveutilities/tsrc/public/basic/data/distribution.policy.s60
--- a/coreapplicationuis/powersaveutilities/tsrc/public/basic/data/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/powersaveutilities/tsrc/public/basic/distribution.policy.s60
--- a/coreapplicationuis/powersaveutilities/tsrc/public/basic/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/powersaveutilities/tsrc/public/basic/group/distribution.policy.s60
--- a/coreapplicationuis/powersaveutilities/tsrc/public/basic/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/powersaveutilities/tsrc/public/basic/init/distribution.policy.s60
--- a/coreapplicationuis/powersaveutilities/tsrc/public/basic/init/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/powersaveutilities/tsrc/public/basic/rom/distribution.policy.s60
--- a/coreapplicationuis/powersaveutilities/tsrc/public/basic/rom/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/powersaveutilities/tsrc/public/distribution.policy.s60
--- a/coreapplicationuis/powersaveutilities/tsrc/public/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/AIRFSPlugin/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/AIRFSPlugin/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/AIRFSPlugin/cenrep/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/AIRFSPlugin/cenrep/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/AIRFSPlugin/conf/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/AIRFSPlugin/conf/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/AIRFSPlugin/group/AIRFSPlugin.mmp
--- a/coreapplicationuis/rfsplugins/AIRFSPlugin/group/AIRFSPlugin.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/rfsplugins/AIRFSPlugin/group/AIRFSPlugin.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -19,7 +19,7 @@
 
 #include <platform_paths.hrh>
 
-TARGET      AIRFSPlugin.dll
+TARGET      airfsplugin.dll
 
 TARGETTYPE	PLUGIN
 
@@ -34,7 +34,7 @@
 
 START RESOURCE 2000F8BD.rss
 #ifdef SYMBIAN_SECURE_ECOM 
-  TARGET AIRFSPlugin.rsc
+  TARGET airfsplugin.rsc
 #endif 
 END
 
@@ -45,4 +45,4 @@
 MW_LAYER_SYSTEMINCLUDE
 
 LIBRARY euser.lib       // Base library
-LIBRARY ECom.lib	    // ECom library
+LIBRARY ecom.lib	    // ECom library
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/AIRFSPlugin/group/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/AIRFSPlugin/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/AIRFSPlugin/inc/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/AIRFSPlugin/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/AIRFSPlugin/src/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/AIRFSPlugin/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/CertRFSPlugin/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/CertRFSPlugin/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/CertRFSPlugin/cenrep/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/CertRFSPlugin/cenrep/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/CertRFSPlugin/conf/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/CertRFSPlugin/conf/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/CertRFSPlugin/group/CertRFSPlugin.mmp
--- a/coreapplicationuis/rfsplugins/CertRFSPlugin/group/CertRFSPlugin.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/rfsplugins/CertRFSPlugin/group/CertRFSPlugin.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -19,7 +19,7 @@
 
 #include <platform_paths.hrh>
 
-TARGET      CertRFSPlugin.dll
+TARGET      certrfsplugin.dll
 
 TARGETTYPE	PLUGIN
 
@@ -34,7 +34,7 @@
 
 START RESOURCE 2000F8B9.rss
 #ifdef SYMBIAN_SECURE_ECOM 
-  TARGET CertRFSPlugin.rsc
+  TARGET certrfsplugin.rsc
 #endif 
 END
 
@@ -45,4 +45,4 @@
 MW_LAYER_SYSTEMINCLUDE
 
 LIBRARY euser.lib       // Base library
-LIBRARY ECom.lib	    // ECom library
+LIBRARY ecom.lib	    // ECom library
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/CertRFSPlugin/group/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/CertRFSPlugin/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/CertRFSPlugin/inc/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/CertRFSPlugin/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/CertRFSPlugin/src/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/CertRFSPlugin/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/ClockRFSPlugin/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/ClockRFSPlugin/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/ClockRFSPlugin/cenrep/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/ClockRFSPlugin/cenrep/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/ClockRFSPlugin/conf/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/ClockRFSPlugin/conf/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/ClockRFSPlugin/group/ClockRFSPlugin.mmp
--- a/coreapplicationuis/rfsplugins/ClockRFSPlugin/group/ClockRFSPlugin.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/rfsplugins/ClockRFSPlugin/group/ClockRFSPlugin.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -19,7 +19,7 @@
 
 #include <platform_paths.hrh>
 
-TARGET      ClockRFSPlugin.dll
+TARGET      clockrfsplugin.dll
 
 TARGETTYPE	PLUGIN
 
@@ -34,7 +34,7 @@
 
 START RESOURCE 2000F8BE.rss
 #ifdef SYMBIAN_SECURE_ECOM 
-  TARGET ClockRFSPlugin.rsc
+  TARGET clockrfsplugin.rsc
 #endif 
 END
 
@@ -45,4 +45,4 @@
 MW_LAYER_SYSTEMINCLUDE
 
 LIBRARY euser.lib       // Base library
-LIBRARY ECom.lib	    // ECom library
+LIBRARY ecom.lib	    // ECom library
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/ClockRFSPlugin/group/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/ClockRFSPlugin/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/ClockRFSPlugin/inc/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/ClockRFSPlugin/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/ClockRFSPlugin/src/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/ClockRFSPlugin/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/DatastoreRFSPlugin/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/DatastoreRFSPlugin/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/DatastoreRFSPlugin/cenrep/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/DatastoreRFSPlugin/cenrep/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/DatastoreRFSPlugin/conf/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/DatastoreRFSPlugin/conf/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/DatastoreRFSPlugin/group/DatastoreRFSPlugin.mmp
--- a/coreapplicationuis/rfsplugins/DatastoreRFSPlugin/group/DatastoreRFSPlugin.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/rfsplugins/DatastoreRFSPlugin/group/DatastoreRFSPlugin.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -19,7 +19,7 @@
 
 #include <platform_paths.hrh>
 
-TARGET      DatastoreRFSPlugin.dll
+TARGET      datastorerfsplugin.dll
 
 TARGETTYPE	PLUGIN
 
@@ -34,7 +34,7 @@
 
 START RESOURCE 2000F8C2.rss
 #ifdef SYMBIAN_SECURE_ECOM 
-  TARGET DatastoreRFSPlugin.rsc
+  TARGET datastorerfsplugin.rsc
 #endif 
 END
 
@@ -45,4 +45,4 @@
 MW_LAYER_SYSTEMINCLUDE
 
 LIBRARY euser.lib       // Base library
-LIBRARY ECom.lib	    // ECom library
+LIBRARY ecom.lib	    // ECom library
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/DatastoreRFSPlugin/group/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/DatastoreRFSPlugin/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/DatastoreRFSPlugin/inc/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/DatastoreRFSPlugin/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/DatastoreRFSPlugin/src/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/DatastoreRFSPlugin/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/DefaultFolderRFSPlugin/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/DefaultFolderRFSPlugin/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/DefaultFolderRFSPlugin/cenrep/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/DefaultFolderRFSPlugin/cenrep/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/DefaultFolderRFSPlugin/conf/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/DefaultFolderRFSPlugin/conf/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/DefaultFolderRFSPlugin/group/DefaultFolderRFSPlugin.mmp
--- a/coreapplicationuis/rfsplugins/DefaultFolderRFSPlugin/group/DefaultFolderRFSPlugin.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/rfsplugins/DefaultFolderRFSPlugin/group/DefaultFolderRFSPlugin.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -19,7 +19,7 @@
 
 #include <platform_paths.hrh>
 
-TARGET      DefaultFolderRFSPlugin.dll
+TARGET      defaultfolderrfsplugin.dll
 
 TARGETTYPE	PLUGIN
 
@@ -34,7 +34,7 @@
 
 START RESOURCE 2000F8BA.rss
 #ifdef SYMBIAN_SECURE_ECOM 
-  TARGET DefaultFolderRFSPlugin.rsc
+  TARGET defaultfolderrfsplugin.rsc
 #endif 
 END
 
@@ -45,4 +45,4 @@
 MW_LAYER_SYSTEMINCLUDE
 
 LIBRARY euser.lib       // Base library
-LIBRARY ECom.lib	    // ECom library
+LIBRARY ecom.lib	    // ECom library
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/DefaultFolderRFSPlugin/group/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/DefaultFolderRFSPlugin/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/DefaultFolderRFSPlugin/inc/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/DefaultFolderRFSPlugin/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/DefaultFolderRFSPlugin/src/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/DefaultFolderRFSPlugin/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/DisplayContrastPlugin/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/DisplayContrastPlugin/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/DisplayContrastPlugin/group/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/DisplayContrastPlugin/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/DisplayContrastPlugin/group/RfsDisplayContrastPlugin.mmp
--- a/coreapplicationuis/rfsplugins/DisplayContrastPlugin/group/RfsDisplayContrastPlugin.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/rfsplugins/DisplayContrastPlugin/group/RfsDisplayContrastPlugin.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -19,7 +19,7 @@
 
 #include <platform_paths.hrh>
 
-TARGET      RfsDisplayContrastPlugin.dll
+TARGET      rfsdisplaycontrastplugin.dll
 
 TARGETTYPE	PLUGIN
 
@@ -34,7 +34,7 @@
 
 START RESOURCE 102071F7.rss
 #ifdef SYMBIAN_SECURE_ECOM 
-  TARGET RfsDisplayContrastPlugin.rsc
+  TARGET rfsdisplaycontrastplugin.rsc
 #endif 
 END
 
@@ -44,5 +44,5 @@
 MW_LAYER_SYSTEMINCLUDE
 
 LIBRARY euser.lib       // Base library
-LIBRARY ECom.lib	    // ECom library
+LIBRARY ecom.lib	    // ECom library
 LIBRARY hal.lib         // HAL library
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/DisplayContrastPlugin/inc/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/DisplayContrastPlugin/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/DisplayContrastPlugin/src/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/DisplayContrastPlugin/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/FavouritesRFSPlugin/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/FavouritesRFSPlugin/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/FavouritesRFSPlugin/cenrep/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/FavouritesRFSPlugin/cenrep/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/FavouritesRFSPlugin/conf/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/FavouritesRFSPlugin/conf/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/FavouritesRFSPlugin/group/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/FavouritesRFSPlugin/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/FavouritesRFSPlugin/group/FavouritesRFSPlugin.mmp
--- a/coreapplicationuis/rfsplugins/FavouritesRFSPlugin/group/FavouritesRFSPlugin.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/rfsplugins/FavouritesRFSPlugin/group/FavouritesRFSPlugin.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -19,7 +19,7 @@
 
 #include <platform_paths.hrh>
 
-TARGET      FavouritesRFSPlugin.dll
+TARGET      favouritesrfsplugin.dll
 
 TARGETTYPE	PLUGIN
 
@@ -34,7 +34,7 @@
 
 START RESOURCE 102071F6.rss
 #ifdef SYMBIAN_SECURE_ECOM 
-  TARGET FavouritesRFSPlugin.rsc
+  TARGET favouritesrfsplugin.rsc
 #endif 
 END
 
@@ -45,5 +45,5 @@
 MW_LAYER_SYSTEMINCLUDE
 
 LIBRARY euser.lib            // Base library
-LIBRARY ECom.lib	         // ECom library
-LIBRARY FavouritesEngine.lib // Favourites engine library
+LIBRARY ecom.lib	         // ECom library
+LIBRARY favouritesengine.lib // Favourites engine library
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/FavouritesRFSPlugin/inc/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/FavouritesRFSPlugin/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/FavouritesRFSPlugin/src/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/FavouritesRFSPlugin/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/FavouritesRFSPlugin/src/FavouritesRFSPlugin.cpp
--- a/coreapplicationuis/rfsplugins/FavouritesRFSPlugin/src/FavouritesRFSPlugin.cpp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/rfsplugins/FavouritesRFSPlugin/src/FavouritesRFSPlugin.cpp	Fri Apr 16 15:08:06 2010 +0300
@@ -17,8 +17,8 @@
 
 
 // INCLUDE FILES
-#include <favouritesdb.h>
-#include <favouriteslimits.h>
+#include <FavouritesDb.h>
+#include <FavouritesLimits.h>
 #include "FavouritesRFSPluginPrivateCRKeys.h"
 #include "FavouritesRFSPlugin.h"
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/FormatterRFSPlugin/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/FormatterRFSPlugin/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/FormatterRFSPlugin/cenrep/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/FormatterRFSPlugin/cenrep/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/FormatterRFSPlugin/conf/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/FormatterRFSPlugin/conf/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/FormatterRFSPlugin/data/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/FormatterRFSPlugin/data/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/FormatterRFSPlugin/group/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/FormatterRFSPlugin/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/FormatterRFSPlugin/inc/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/FormatterRFSPlugin/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/FormatterRFSPlugin/src/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/FormatterRFSPlugin/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/FormatterRFSPlugin/src/formatterrfsplugin.cpp
--- a/coreapplicationuis/rfsplugins/FormatterRFSPlugin/src/formatterrfsplugin.cpp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/rfsplugins/FormatterRFSPlugin/src/formatterrfsplugin.cpp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2006-2010 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"
@@ -19,10 +19,10 @@
 // SYSTEM INCLUDE
 #include <centralrepository.h>
 #include <driveinfo.h>
-#include <swi\sisregistrysession.h>
-#include <swi\sisregistryentry.h>
-#include <swi\sisregistrypackage.h>
-#include <mmf\common\mmfcontrollerpluginresolver.h>
+#include <swi/sisregistrysession.h>
+#include <swi/sisregistryentry.h>
+#include <swi/sisregistrypackage.h>
+#include <mmf/common/mmfcontrollerpluginresolver.h>
 // USER INCLUDE
 #include "formatterrfsplugin.h"
 #include "formatterrfspluginprivatecrkeys.h"
@@ -44,56 +44,58 @@
 //
 static void FileWriteL(RPointerArray<HBufC> &files)
     {
-    RFs iFs;
-    RFile iFile;
-    User::LeaveIfError(iFs.Connect());
-    TInt err = iFile.Open(iFs,_L("c:\\private\\100059C9\\excludelistcache.txt"),EFileWrite);
+    RFs fileSession;
+    RFile file;
+    User::LeaveIfError(fileSession.Connect());
+    TInt err = file.Open(fileSession,_L("c:\\private\\100059C9\\excludelistcache.txt"),EFileWrite|EFileStreamText);
 
     if ( err != KErrNone )
         {
         RDebug::Print(_L("CFormatterRFSPlugin::ExcludeListNameL , FileWrite : Failed to open the file"));
         return;
         }
-    TBuf8 <1> newLine;
-    newLine.Append('\n');
     TInt pos = 0;
-    iFile.Seek(ESeekEnd,pos);
+    file.Seek(ESeekEnd,pos);
     TInt size = files.Count();
+    RBuf filenameBuf;
+
     for ( TInt i=0; i < size; i++)
         {
         HBufC8* fileName = HBufC8::NewLC(files[i]->Size());
         TPtr8 fileNamePtr(fileName->Des());
         fileNamePtr.Copy(*files[i]);
-        iFile.Write(*fileName);
-        iFile.Write(newLine);
+
+        filenameBuf.Create(fileNamePtr.Length());
+        filenameBuf.Copy(fileNamePtr);
+        TFileText fileText ;
+        fileText.Set(file) ;
+        fileText.Seek(ESeekStart);
+        fileText.Write(filenameBuf);
         CleanupStack::PopAndDestroy();//Filename
-        iFile.Flush();
+        file.Flush();
         }
-    iFile.Close();
-    iFs.Close();
-    
+    file.Close();
+    fileSession.Close();    
     }
 
 static void MergeFilesL()
     {
     
-    RFs iSession;
-    RFile iExclude;
+    RFs fileSession;
+    RFile excludeFileName;
     
-    RFs iFs;
-    RFile iFile;
+    RFile fileName;
     TInt pos = 0;
     TInt size_of_script( 0 );
     TInt buffer_size( sizeof(TText) );
     TInt number_of_chars;
     
-    User::LeaveIfError(iSession.Connect());
-    TInt ret = iExclude.Open(iSession,_L("c:\\private\\100059C9\\excludelist.txt"),EFileRead);
+    User::LeaveIfError(fileSession.Connect());
+    TInt ret = excludeFileName.Open(fileSession,_L("c:\\private\\100059C9\\excludelist.txt"),EFileRead);
 
-    User::LeaveIfError(iFs.Connect());
-    TInt err1 = iFile.Open(iFs,_L("c:\\private\\100059C9\\excludelistcache.txt"),EFileWrite);
+    TInt err1 = fileName.Open(fileSession,_L("c:\\private\\100059C9\\excludelistcache.txt"),EFileWrite|EFileStreamText);
     
-    iFile.Seek(ESeekEnd,pos);
+    fileName.Seek(ESeekEnd,pos);
     if ( ret != KErrNone || err1 != KErrNone)
             {
             RDebug::Print(_L("CFormatterRFSPlugin::ExcludeListNameL , MergeFiles : Failed to open the file"));
@@ -103,7 +105,7 @@
     TPtr8 bufferPtr( (TUint8*)buffer->Ptr(), buffer_size);
     
     TInt err(0);
-    err = iExclude.Size( size_of_script );
+    err = excludeFileName.Size( size_of_script );
     number_of_chars = size_of_script / sizeof(TText);
 
     TInt i(0);
@@ -111,50 +113,47 @@
        {
        if ( err == KErrNone )
             {
-            err = iExclude.Read( bufferPtr);                
+            err = excludeFileName.Read( bufferPtr);                
             }
-        iFile.Write(bufferPtr);
+        fileName.Write(bufferPtr);
         }
-    iFile.Flush();
-    iFile.Close();
-    iFs.Close();
+    fileName.Flush();
+    fileName.Close();
     
-    iExclude.Close();
-    iSession.Close();
+    excludeFileName.Close();
+    fileSession.Close();
+    CleanupStack::PopAndDestroy();//buffer
 
-    CleanupStack::PopAndDestroy();//buffer
-    
     }
 
 static HBufC* ExcludeListNameL( TChar aSystemDrive )
     {
     FUNC_LOG;
-
+		
     RDebug::Print(_L("CFormatterRFSPlugin::ExcludeListNameL"));
     
-    RFs iFs;
-    RFile iFile;
+    RFs fileSession;
+    RFile file;
     
     _LIT8(KFileName, "c:\\private\\100059C9\\excludelistcache.txt\n");
     TBuf8 <50> fileName;
     fileName.Copy(KFileName);
 
-    User::LeaveIfError(iFs.Connect());
+    User::LeaveIfError(fileSession.Connect());
     
     RDir dir;
-    if(dir.Open(iFs,_L("c:\\private\\100059C9\\"),KEntryAttNormal) != KErrNone)
+    if(dir.Open(fileSession,_L("c:\\private\\100059C9\\"),KEntryAttNormal) != KErrNone)
         {
-        iFs.MkDir(_L("c:\\private\\100059C9\\"));
+        User::LeaveIfError(fileSession.MkDir(_L("c:\\private\\100059C9\\")));
         }
     
-    TInt rev = iFile.Replace(iFs,_L("c:\\private\\100059C9\\excludelistcache.txt"),EFileWrite);
+    TInt rev = file.Replace(fileSession,_L("c:\\private\\100059C9\\excludelistcache.txt"),EFileWrite|EFileStreamText);
     
     RDebug::Print(_L("CFormatterRFSPlugin::ExcludeListNameL, Replace returned %d"),rev);
     
-    iFile.Write(fileName);
-    iFile.Flush();
-    iFile.Close();
-    iFs.Close();
+    file.Flush();
+    file.Close();
+    fileSession.Close();
     
     Swi::RSisRegistrySession session;
     CleanupClosePushL(session);
@@ -171,76 +170,97 @@
     CleanupClosePushL(entry);
     CleanupClosePushL(entry2);
     
-    
-    //No issues until here
-    RPointerArray<HBufC> allfiles;
+    RPointerArray<HBufC> registryFiles;
+    RPointerArray<HBufC> augmentedRegistryFiles;
     RPointerArray<HBufC> nonRemovableFiles;
     RPointerArray<HBufC> nonRemovableAugmentedFiles;
-    CleanupResetAndDestroyPushL(allfiles);
+    CleanupResetAndDestroyPushL(registryFiles);
+    CleanupResetAndDestroyPushL(augmentedRegistryFiles);
     CleanupResetAndDestroyPushL(nonRemovableFiles);
     CleanupResetAndDestroyPushL(nonRemovableAugmentedFiles);
     
-    //Logic starts
-    TInt count;
-    RPointerArray<Swi::CSisRegistryPackage> augmentationPackages;
-    CleanupResetAndDestroyPushL(augmentationPackages);
-    for ( TInt iter=0; iter<uidcount; iter++)
-        {
-        User::LeaveIfError(entry.Open(session,uids[iter]));
-        if(EFalse == entry.RemovableL())
-            {
-            entry.FilesL(nonRemovableFiles);
-            TInt fileCount = nonRemovableFiles.Count(); 
-            for (TInt z=fileCount-1; z>=0;z--)
-                {
-                TPtr firstChar(nonRemovableFiles[z]->Des());
-                if(firstChar.Mid(0,1) == _L("z"))
-                    {
-                    delete nonRemovableFiles[z];
-                    nonRemovableFiles.Remove(z);
-                    }
-                }
-            // Look for augmentations.
-            if(entry.IsAugmentationL())
-                {
-                entry.AugmentationsL(augmentationPackages);
-                count = entry.AugmentationsNumberL();
-                for (TInt i=0; i < count; ++i)
-                    {
-                    User::LeaveIfError(entry2.OpenL(session,*augmentationPackages[i]));
-                    if(EFalse == entry2.RemovableL())
-                        {
-                        entry2.FilesL(nonRemovableAugmentedFiles);
-                        for (TInt c=0; c<nonRemovableAugmentedFiles.Count();c++)
-                              {
-                              TPtr firstChar(nonRemovableAugmentedFiles[c]->Des());
-                              if(firstChar.Mid(0,1) == _L("z"))
-                                  {
-                                  delete nonRemovableAugmentedFiles[c];
-                                  nonRemovableAugmentedFiles.Remove(c);
-                                  }
-                              }
-                        }
-                    entry2.Close();
-                    }
-                }
-            }
-        entry.Close();
-        }
-    RDebug::Print(_L("CFormatterRFSPlugin::ExcludeListNameL Writing the file names to the excludelist.txt"));
+     TInt count;
+     RPointerArray<Swi::CSisRegistryPackage> augmentationPackages;
+     CleanupResetAndDestroyPushL(augmentationPackages);
+     for ( TInt iter=0; iter<uidcount; iter++)
+         {
+         User::LeaveIfError(entry.Open(session,uids[iter]));
+         if(EFalse == entry.RemovableL())
+             {
+             entry.FilesL(nonRemovableFiles);
+             entry.RegistryFilesL(registryFiles);
+             TInt fileCount = nonRemovableFiles.Count(); 
+             for (TInt z=fileCount-1; z>=0;z--)
+                 {
+                 TPtr firstChar(nonRemovableFiles[z]->Des());
+                 if(firstChar.Mid(0,1) == _L("z"))
+                     {
+                     delete nonRemovableFiles[z];
+                     nonRemovableFiles.Remove(z);
+                     }
+                 }
+             // Look for augmentations.
+             if(entry.IsAugmentationL())
+                 {
+                 entry.AugmentationsL(augmentationPackages);
+                 count = entry.AugmentationsNumberL();
+                 for (TInt i=0; i < count; ++i)
+                     {
+                     User::LeaveIfError(entry2.OpenL(session,*augmentationPackages[i]));
+                     if(EFalse == entry2.RemovableL())
+                         {
+                         entry2.FilesL(nonRemovableAugmentedFiles);
+                         entry2.RegistryFilesL(augmentedRegistryFiles);
+                         for (TInt c=0; c<nonRemovableAugmentedFiles.Count();c++)
+                               {
+                               TPtr firstChar(nonRemovableAugmentedFiles[c]->Des());
+                               if(firstChar.Mid(0,1) == _L("z"))
+                                   {
+                                   delete nonRemovableAugmentedFiles[c];
+                                   nonRemovableAugmentedFiles.Remove(c);
+                                   }
+                               }
+											}
+                     	entry2.Close();
+                     	}
+                 }
+             }
+         entry.Close();
+         }
+     RDebug::Print(_L("CFormatterRFSPlugin::ExcludeListNameL Writing the file names to the excludelist.txt"));
+ 
+     MergeFilesL();
+		 FileWriteL(nonRemovableAugmentedFiles);
+		 FileWriteL(augmentedRegistryFiles);
+		 FileWriteL(nonRemovableFiles);
+ 		 FileWriteL(registryFiles);
 
-		FileWriteL(nonRemovableFiles);
-    FileWriteL(nonRemovableAugmentedFiles);
-    MergeFilesL();
-    
-    CleanupStack::PopAndDestroy(8,&session);
+     TInt pos = 0;
+     User::LeaveIfError(fileSession.Connect());
+     User::LeaveIfError(file.Open(fileSession,_L("c:\\private\\100059C9\\excludelistcache.txt"),EFileWrite|EFileStreamText));
+          
+     file.Seek(ESeekEnd,pos);
 
-    HBufC* buf = HBufC::NewLC( KExcludeListcache().Length() + KExcludeListPathNameLenExt );
-    TPtr bufPtr = buf->Des();
-    bufPtr.Append( aSystemDrive );
-    bufPtr.Append( KDriveDelimiter );
-    bufPtr.Append( KExcludeListcache );
-    CleanupStack::Pop( buf );
+     TBuf<KMaxFileName> configurationLine ;
+     TFileText fileText ;
+     fileText.Set(file) ;
+     fileText.Seek(ESeekStart);
+     configurationLine.Format(_L("c:\\private\\100059C9\\excludelistcache.txt")) ;
+     fileText.Write(configurationLine);
+     
+     file.Flush();
+     file.Close();
+     fileSession.Close();
+    
+     
+     CleanupStack::PopAndDestroy(9,&session);
+
+     HBufC* buf = HBufC::NewLC( KExcludeListcache().Length() + KExcludeListPathNameLenExt );
+     TPtr bufPtr = buf->Des();
+     bufPtr.Append( aSystemDrive );
+     bufPtr.Append( KDriveDelimiter );
+     bufPtr.Append( KExcludeListcache );
+     CleanupStack::Pop( buf );
     return buf;
     }
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/NitzRFSPlugin/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/NitzRFSPlugin/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/NitzRFSPlugin/cenrep/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/NitzRFSPlugin/cenrep/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/NitzRFSPlugin/conf/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/NitzRFSPlugin/conf/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/NitzRFSPlugin/group/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/NitzRFSPlugin/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/NitzRFSPlugin/group/NitzRFSPlugin.mmp
--- a/coreapplicationuis/rfsplugins/NitzRFSPlugin/group/NitzRFSPlugin.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/rfsplugins/NitzRFSPlugin/group/NitzRFSPlugin.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -19,7 +19,7 @@
 
 #include <platform_paths.hrh>
 
-TARGET      NitzRFSPlugin.dll
+TARGET      nitzrfsplugin.dll
 
 TARGETTYPE	PLUGIN
 
@@ -34,7 +34,7 @@
 
 START RESOURCE 2000F8BF.rss
 #ifdef SYMBIAN_SECURE_ECOM 
-  TARGET NitzRFSPlugin.rsc
+  TARGET nitzrfsplugin.rsc
 #endif 
 END
 
@@ -45,4 +45,4 @@
 MW_LAYER_SYSTEMINCLUDE
 
 LIBRARY euser.lib       // Base library
-LIBRARY ECom.lib	    // ECom library
+LIBRARY ecom.lib	    // ECom library
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/NitzRFSPlugin/inc/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/NitzRFSPlugin/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/NitzRFSPlugin/src/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/NitzRFSPlugin/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/SIPRFSPlugin/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/SIPRFSPlugin/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/SIPRFSPlugin/cenrep/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/SIPRFSPlugin/cenrep/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/SIPRFSPlugin/conf/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/SIPRFSPlugin/conf/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/SIPRFSPlugin/group/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/SIPRFSPlugin/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/SIPRFSPlugin/group/SipRFSPlugin.mmp
--- a/coreapplicationuis/rfsplugins/SIPRFSPlugin/group/SipRFSPlugin.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/rfsplugins/SIPRFSPlugin/group/SipRFSPlugin.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -19,7 +19,7 @@
 
 #include <platform_paths.hrh>
 
-TARGET      SIPRFSPlugin.dll
+TARGET      siprfsplugin.dll
 
 TARGETTYPE	PLUGIN
 
@@ -34,7 +34,7 @@
 
 START RESOURCE 2001959D.rss
 #ifdef SYMBIAN_SECURE_ECOM 
-  TARGET SIPRFSPlugin.rsc
+  TARGET siprfsplugin.rsc
 #endif 
 END
 
@@ -45,4 +45,4 @@
 MW_LAYER_SYSTEMINCLUDE
 
 LIBRARY euser.lib       // Base library
-LIBRARY ECom.lib	    // ECom library
+LIBRARY ecom.lib	    // ECom library
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/SIPRFSPlugin/inc/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/SIPRFSPlugin/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/SIPRFSPlugin/src/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/SIPRFSPlugin/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/StarterRFSPlugin/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/StarterRFSPlugin/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/StarterRFSPlugin/cenrep/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/StarterRFSPlugin/cenrep/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/StarterRFSPlugin/conf/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/StarterRFSPlugin/conf/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/StarterRFSPlugin/group/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/StarterRFSPlugin/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/StarterRFSPlugin/group/StarterRFSPlugin.mmp
--- a/coreapplicationuis/rfsplugins/StarterRFSPlugin/group/StarterRFSPlugin.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/rfsplugins/StarterRFSPlugin/group/StarterRFSPlugin.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -19,7 +19,7 @@
 
 #include <platform_paths.hrh>
 
-TARGET      StarterRFSPlugin.dll
+TARGET      starterrfsplugin.dll
 
 TARGETTYPE	PLUGIN
 
@@ -34,7 +34,7 @@
 
 START RESOURCE 2000F8BB.rss
 #ifdef SYMBIAN_SECURE_ECOM 
-  TARGET StarterRFSPlugin.rsc
+  TARGET starterrfsplugin.rsc
 #endif 
 END
 
@@ -45,4 +45,4 @@
 MW_LAYER_SYSTEMINCLUDE
 
 LIBRARY euser.lib       // Base library
-LIBRARY ECom.lib	    // ECom library
+LIBRARY ecom.lib	    // ECom library
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/StarterRFSPlugin/inc/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/StarterRFSPlugin/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/StarterRFSPlugin/src/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/StarterRFSPlugin/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/SyncMLRFSPlugin/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/SyncMLRFSPlugin/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/SyncMLRFSPlugin/cenrep/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/SyncMLRFSPlugin/cenrep/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/SyncMLRFSPlugin/conf/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/SyncMLRFSPlugin/conf/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/SyncMLRFSPlugin/group/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/SyncMLRFSPlugin/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/SyncMLRFSPlugin/group/SyncMLRFSPlugin.mmp
--- a/coreapplicationuis/rfsplugins/SyncMLRFSPlugin/group/SyncMLRFSPlugin.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/rfsplugins/SyncMLRFSPlugin/group/SyncMLRFSPlugin.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -19,7 +19,7 @@
 
 #include <platform_paths.hrh>
 
-TARGET      SyncMLRFSPlugin.dll
+TARGET      syncmlrfsplugin.dll
 
 TARGETTYPE	PLUGIN
 
@@ -34,7 +34,7 @@
 
 START RESOURCE 2000F8BC.rss
 #ifdef SYMBIAN_SECURE_ECOM 
-  TARGET SyncMLRFSPlugin.rsc
+  TARGET syncmlrfsplugin.rsc
 #endif 
 END
 
@@ -45,4 +45,4 @@
 MW_LAYER_SYSTEMINCLUDE
 
 LIBRARY euser.lib       // Base library
-LIBRARY ECom.lib	    // ECom library
+LIBRARY ecom.lib	    // ECom library
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/SyncMLRFSPlugin/inc/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/SyncMLRFSPlugin/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/SyncMLRFSPlugin/src/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/SyncMLRFSPlugin/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/TelephonyRFSPlugin/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/TelephonyRFSPlugin/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/TelephonyRFSPlugin/cenrep/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/TelephonyRFSPlugin/cenrep/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/TelephonyRFSPlugin/conf/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/TelephonyRFSPlugin/conf/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/TelephonyRFSPlugin/group/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/TelephonyRFSPlugin/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/TelephonyRFSPlugin/group/TelephonyRFSPlugin.mmp
--- a/coreapplicationuis/rfsplugins/TelephonyRFSPlugin/group/TelephonyRFSPlugin.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/rfsplugins/TelephonyRFSPlugin/group/TelephonyRFSPlugin.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -19,7 +19,7 @@
 
 #include <platform_paths.hrh>
 
-TARGET      TelephonyRFSPlugin.dll
+TARGET      telephonyrfsplugin.dll
 
 TARGETTYPE	PLUGIN
 
@@ -34,7 +34,7 @@
 
 START RESOURCE 2000F8C1.rss
 #ifdef SYMBIAN_SECURE_ECOM 
-  TARGET TelephonyRFSPlugin.rsc
+  TARGET telephonyrfsplugin.rsc
 #endif 
 END
 
@@ -45,4 +45,4 @@
 MW_LAYER_SYSTEMINCLUDE
 
 LIBRARY euser.lib       // Base library
-LIBRARY ECom.lib	    // ECom library
+LIBRARY ecom.lib	    // ECom library
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/TelephonyRFSPlugin/inc/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/TelephonyRFSPlugin/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/TelephonyRFSPlugin/src/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/TelephonyRFSPlugin/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/UnitconverterRFSPlugin/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/UnitconverterRFSPlugin/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/UnitconverterRFSPlugin/cenrep/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/UnitconverterRFSPlugin/cenrep/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/UnitconverterRFSPlugin/conf/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/UnitconverterRFSPlugin/conf/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/UnitconverterRFSPlugin/group/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/UnitconverterRFSPlugin/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/UnitconverterRFSPlugin/group/UnitconverterRFSPlugin.mmp
--- a/coreapplicationuis/rfsplugins/UnitconverterRFSPlugin/group/UnitconverterRFSPlugin.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/rfsplugins/UnitconverterRFSPlugin/group/UnitconverterRFSPlugin.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -19,7 +19,7 @@
 
 #include <platform_paths.hrh>
 
-TARGET      UnitconverterRFSPlugin.dll
+TARGET      unitconverterrfsplugin.dll
 
 TARGETTYPE	PLUGIN
 
@@ -34,7 +34,7 @@
 
 START RESOURCE 2000F8C0.rss
 #ifdef SYMBIAN_SECURE_ECOM 
-  TARGET UnitconverterRFSPlugin.rsc
+  TARGET unitconverterrfsplugin.rsc
 #endif 
 END
 
@@ -45,4 +45,4 @@
 MW_LAYER_SYSTEMINCLUDE
 
 LIBRARY euser.lib       // Base library
-LIBRARY ECom.lib	    // ECom library
+LIBRARY ecom.lib	    // ECom library
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/UnitconverterRFSPlugin/inc/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/UnitconverterRFSPlugin/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/UnitconverterRFSPlugin/src/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/UnitconverterRFSPlugin/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/group/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/group/bld.inf
--- a/coreapplicationuis/rfsplugins/group/bld.inf	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/rfsplugins/group/bld.inf	Fri Apr 16 15:08:06 2010 +0300
@@ -13,6 +13,16 @@
 *
 * Description:  Build information file for RFS plugins.
 *
+*  Copyright (c) 2008 Nokia Corporation.
+*  This material, including documentation and any related 
+*  computer programs, is protected by copyright controlled by
+*  Nokia Corporation. All rights are reserved. Copying,
+*  including reproducing, storing, adapting or translating, any
+*  or all of this material requires the prior written consent of
+*  Nokia Corporation. This material also contains confidential
+*  information which may not be disclosed to others without the
+*  prior written consent of Nokia Corporation.
+* ==============================================================================
 */
 
 #include <platform_paths.hrh>
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/msgcentrerfsplugin/data/distribution.policy.s60
--- a/coreapplicationuis/rfsplugins/msgcentrerfsplugin/data/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/msgcentrerfsplugin/distribution.policy.s60
--- a/coreapplicationuis/rfsplugins/msgcentrerfsplugin/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/msgcentrerfsplugin/group/distribution.policy.s60
--- a/coreapplicationuis/rfsplugins/msgcentrerfsplugin/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/msgcentrerfsplugin/group/msgcentrerfsplugin.mmp
--- a/coreapplicationuis/rfsplugins/msgcentrerfsplugin/group/msgcentrerfsplugin.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/rfsplugins/msgcentrerfsplugin/group/msgcentrerfsplugin.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -44,4 +44,4 @@
 LIBRARY         eikcore.lib             // Eikon library
 LIBRARY         euser.lib               // Base library
 LIBRARY         cone.lib                // Control environment library
-LIBRARY         muiu.lib                // For message centre reset
+LIBRARY         muiuutils.lib                // For message centre reset
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/msgcentrerfsplugin/inc/distribution.policy.s60
--- a/coreapplicationuis/rfsplugins/msgcentrerfsplugin/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/msgcentrerfsplugin/src/distribution.policy.s60
--- a/coreapplicationuis/rfsplugins/msgcentrerfsplugin/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/rom/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/rom/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/tsrc/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/tsrc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/formatterrfsplugintest/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/formatterrfsplugintest/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/formatterrfsplugintest/bwins/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/formatterrfsplugintest/bwins/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/formatterrfsplugintest/eabi/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/formatterrfsplugintest/eabi/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/formatterrfsplugintest/group/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/formatterrfsplugintest/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/formatterrfsplugintest/inc/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/formatterrfsplugintest/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/formatterrfsplugintest/src/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/formatterrfsplugintest/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/group/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/inc/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/bwins/distribution.policy.s60
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/bwins/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/conf/distribution.policy.s60
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/conf/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/distribution.policy.s60
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/eabi/distribution.policy.s60
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/eabi/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/group/distribution.policy.s60
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/inc/distribution.policy.s60
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/init/distribution.policy.s60
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/init/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/init/msgcentrerfsplugintest.ini
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/init/msgcentrerfsplugintest.ini	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/init/msgcentrerfsplugintest.ini	Fri Apr 16 15:08:06 2010 +0300
@@ -19,6 +19,8 @@
 # Comment lines start with '#'-character.
 # See STIF TestFramework users guide.doc for instructions
 
+
+
 # -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
 # Set following test engine settings:
 #	- Set Test Reporting mode. TestReportMode's possible values are:
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/src/distribution.policy.s60
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/rfstestapp/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/rfstestapp/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/rfstestapp/data/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/rfstestapp/data/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/rfstestapp/group/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/rfstestapp/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/rfstestapp/inc/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/rfstestapp/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/rfstestapp/src/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/rfstestapp/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/bwins/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/bwins/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/conf/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/conf/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/data/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/data/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/eabi/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/eabi/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/group/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/inc/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/init/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/init/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/rom/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/rom/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/src/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/testdatacreator/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/testdatacreator/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/testdatacreator/group/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/testdatacreator/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/testdatacreator/inc/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/testdatacreator/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/testdatacreator/src/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/testdatacreator/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/src/Distribution.Policy.S60
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/sensordatacompensatorplugin/BWINS/Distribution.Policy.S60
--- a/coreapplicationuis/sensordatacompensatorplugin/BWINS/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/sensordatacompensatorplugin/Distribution.Policy.S60
--- a/coreapplicationuis/sensordatacompensatorplugin/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/sensordatacompensatorplugin/EABI/Distribution.Policy.S60
--- a/coreapplicationuis/sensordatacompensatorplugin/EABI/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/sensordatacompensatorplugin/data/Distribution.Policy.S60
--- a/coreapplicationuis/sensordatacompensatorplugin/data/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/sensordatacompensatorplugin/group/Distribution.Policy.S60
--- a/coreapplicationuis/sensordatacompensatorplugin/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/sensordatacompensatorplugin/group/bld.inf
--- a/coreapplicationuis/sensordatacompensatorplugin/group/bld.inf	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/sensordatacompensatorplugin/group/bld.inf	Fri Apr 16 15:08:06 2010 +0300
@@ -23,13 +23,13 @@
 
 PRJ_EXPORTS
 
-../data/sensordatacompensationui.rul               /epoc32/data/Z/private/10282bc4/rules/sensordatacompensationui.rul
-../data/sensordatacompensationui.rul               /epoc32/RELEASE/winscw/UDEB/Z/private/10282bc4/rules/sensordatacompensationui.rul
-../data/sensordatacompensationui.rul               /epoc32/RELEASE/winscw/UREL/Z/private/10282bc4/rules/sensordatacompensationui.rul
+../data/sensordatacompensationui.rul               /epoc32/data/z/private/10282bc4/rules/sensordatacompensationui.rul
+../data/sensordatacompensationui.rul               /epoc32/release/winscw/udeb/z/private/10282bc4/rules/sensordatacompensationui.rul
+../data/sensordatacompensationui.rul               /epoc32/release/winscw/urel/z/private/10282bc4/rules/sensordatacompensationui.rul
 
-../data/sensordatacompensationdevice.rul           /epoc32/data/Z/private/10282bc4/rules/sensordatacompensationdevice.rul
-../data/sensordatacompensationdevice.rul           /epoc32/RELEASE/winscw/UDEB/Z/private/10282bc4/rules/sensordatacompensationdevice.rul
-../data/sensordatacompensationdevice.rul           /epoc32/RELEASE/winscw/UREL/Z/private/10282bc4/rules/sensordatacompensationdevice.rul
+../data/sensordatacompensationdevice.rul           /epoc32/data/z/private/10282bc4/rules/sensordatacompensationdevice.rul
+../data/sensordatacompensationdevice.rul           /epoc32/release/winscw/udeb/z/private/10282bc4/rules/sensordatacompensationdevice.rul
+../data/sensordatacompensationdevice.rul           /epoc32/release/winscw/urel/z/private/10282bc4/rules/sensordatacompensationdevice.rul
 
 ../rom/sensordatacompensatorplugin.iby           CORE_MW_LAYER_IBY_EXPORT_PATH( sensordatacompensatorplugin.iby )
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/sensordatacompensatorplugin/inc/Distribution.Policy.S60
--- a/coreapplicationuis/sensordatacompensatorplugin/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/sensordatacompensatorplugin/rom/Distribution.Policy.S60
--- a/coreapplicationuis/sensordatacompensatorplugin/rom/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/sensordatacompensatorplugin/src/Distribution.Policy.S60
--- a/coreapplicationuis/sensordatacompensatorplugin/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/sensordatacompensatorplugin/tsrc/distribution.policy.s60
--- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/BWINS/distribution.policy.s60
--- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/BWINS/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/EABI/distribution.policy.s60
--- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/EABI/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/conf/distribution.policy.s60
--- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/conf/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/conf/sensordatacompensatorplgtest.cfg
--- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/conf/sensordatacompensatorplgtest.cfg	Tue Feb 02 10:12:00 2010 +0200
+++ b/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/conf/sensordatacompensatorplgtest.cfg	Fri Apr 16 15:08:06 2010 +0300
@@ -16,6 +16,7 @@
 */
 
 
+
 // Publish&Subscribe definitions
 [Define]
 KSensrvChannelTypeIdAccelerometerXYZAxisData 270553214
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/data/distribution.policy.s60
--- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/data/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/data/group/distribution.policy.s60
--- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/data/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/distribution.policy.s60
--- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/group/distribution.policy.s60
--- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/inc/distribution.policy.s60
--- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/init/distribution.policy.s60
--- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/init/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/rom/Distribution.Policy.S60
--- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/rom/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/src/distribution.policy.s60
--- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/tsrc/Distribution.Policy.S60
--- a/coreapplicationuis/tsrc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/tsrc/public/Distribution.Policy.S60
--- a/coreapplicationuis/tsrc/public/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/tsrc/public/adv/Distribution.Policy.S60
--- a/coreapplicationuis/tsrc/public/adv/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/tsrc/public/adv/conf/Distribution.Policy.S60
--- a/coreapplicationuis/tsrc/public/adv/conf/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/tsrc/public/adv/data/Distribution.Policy.S60
--- a/coreapplicationuis/tsrc/public/adv/data/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/tsrc/public/adv/group/Distribution.Policy.S60
--- a/coreapplicationuis/tsrc/public/adv/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/tsrc/public/adv/init/Distribution.Policy.S60
--- a/coreapplicationuis/tsrc/public/adv/init/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/tsrc/public/basic/BWINS/Distribution.Policy.S60
--- a/coreapplicationuis/tsrc/public/basic/BWINS/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/tsrc/public/basic/Distribution.Policy.S60
--- a/coreapplicationuis/tsrc/public/basic/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/tsrc/public/basic/EABI/Distribution.Policy.S60
--- a/coreapplicationuis/tsrc/public/basic/EABI/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/tsrc/public/basic/MT_PhoneCmdhandler/Distribution.Policy.S60
--- a/coreapplicationuis/tsrc/public/basic/MT_PhoneCmdhandler/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/tsrc/public/basic/MT_PhoneCmdhandler/Src/Distribution.Policy.S60
--- a/coreapplicationuis/tsrc/public/basic/MT_PhoneCmdhandler/Src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/tsrc/public/basic/MT_Rfs/Distribution.Policy.S60
--- a/coreapplicationuis/tsrc/public/basic/MT_Rfs/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/tsrc/public/basic/MT_Rfs/Src/Distribution.Policy.S60
--- a/coreapplicationuis/tsrc/public/basic/MT_Rfs/Src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/tsrc/public/basic/MT_kefmapper/Distribution.Policy.S60
--- a/coreapplicationuis/tsrc/public/basic/MT_kefmapper/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/tsrc/public/basic/MT_kefmapper/Src/Distribution.Policy.S60
--- a/coreapplicationuis/tsrc/public/basic/MT_kefmapper/Src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/tsrc/public/basic/conf/Distribution.Policy.S60
--- a/coreapplicationuis/tsrc/public/basic/conf/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/tsrc/public/basic/data/Distribution.Policy.S60
--- a/coreapplicationuis/tsrc/public/basic/data/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/tsrc/public/basic/data/rfs/Distribution.Policy.S60
--- a/coreapplicationuis/tsrc/public/basic/data/rfs/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/tsrc/public/basic/group/Distribution.Policy.S60
--- a/coreapplicationuis/tsrc/public/basic/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/tsrc/public/basic/init/Distribution.Policy.S60
--- a/coreapplicationuis/tsrc/public/basic/init/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 coreapplicationuis/tsrc/public/basic/rom/distribution.policy.s60
--- a/coreapplicationuis/tsrc/public/basic/rom/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 filehandling/fileconverterfw/CNFTOOL/distribution.policy.s60
--- a/filehandling/fileconverterfw/CNFTOOL/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 filehandling/fileconverterfw/Design/distribution.policy.s60
--- a/filehandling/fileconverterfw/Design/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 filehandling/fileconverterfw/INC/distribution.policy.s60
--- a/filehandling/fileconverterfw/INC/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 filehandling/fileconverterfw/SRC/distribution.policy.s60
--- a/filehandling/fileconverterfw/SRC/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 filehandling/fileconverterfw/TSRC/W7ALLCHR.DOC
Binary file filehandling/fileconverterfw/TSRC/W7ALLCHR.DOC has changed
diff -r 2e3d3ce01487 -r c4cbaa4fb734 filehandling/fileconverterfw/TSRC/distribution.policy.s60
--- a/filehandling/fileconverterfw/TSRC/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 filehandling/fileconverterfw/Tef/distribution.policy.s60
--- a/filehandling/fileconverterfw/Tef/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 filehandling/fileconverterfw/Tef/scripts/distribution.policy.s60
--- a/filehandling/fileconverterfw/Tef/scripts/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 filehandling/fileconverterfw/bwins/distribution.policy.s60
--- a/filehandling/fileconverterfw/bwins/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 filehandling/fileconverterfw/documentation/SGL.GT0093.110_How_To_Implement_and_use_a_file converter_objectv1.4.doc
Binary file filehandling/fileconverterfw/documentation/SGL.GT0093.110_How_To_Implement_and_use_a_file converter_objectv1.4.doc has changed
diff -r 2e3d3ce01487 -r c4cbaa4fb734 filehandling/fileconverterfw/documentation/distribution.policy.s60
--- a/filehandling/fileconverterfw/documentation/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 filehandling/fileconverterfw/eabi/distribution.policy.s60
--- a/filehandling/fileconverterfw/eabi/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 filehandling/fileconverterfw/group/app-framework_conarc.mrp
--- a/filehandling/fileconverterfw/group/app-framework_conarc.mrp	Tue Feb 02 10:12:00 2010 +0200
+++ b/filehandling/fileconverterfw/group/app-framework_conarc.mrp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,3 +1,19 @@
+#
+# 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: 
+#
+
 component	app-framework_conarc
 source	\sf\mw\appsupport\filehandling\fileconverterfw
 binary	\sf\mw\appsupport\filehandling\fileconverterfw\group	all
diff -r 2e3d3ce01487 -r c4cbaa4fb734 filehandling/fileconverterfw/group/distribution.policy.s60
--- a/filehandling/fileconverterfw/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 filehandling/htmltorichtextconverter/bwins/distribution.policy.s60
--- a/filehandling/htmltorichtextconverter/bwins/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 filehandling/htmltorichtextconverter/documentation/CHTMLTOCRTCONVERTER test code.rtf
Binary file filehandling/htmltorichtextconverter/documentation/CHTMLTOCRTCONVERTER test code.rtf has changed
diff -r 2e3d3ce01487 -r c4cbaa4fb734 filehandling/htmltorichtextconverter/documentation/distribution.policy.s60
--- a/filehandling/htmltorichtextconverter/documentation/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 filehandling/htmltorichtextconverter/eabi/distribution.policy.s60
--- a/filehandling/htmltorichtextconverter/eabi/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp
--- a/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp	Tue Feb 02 10:12:00 2010 +0200
+++ b/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,3 +1,19 @@
+#
+# 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: 
+#
+
 component	app-services_chtmltocrtconv
 source	\sf\mw\appsupport\filehandling\htmltorichtextconverter
 binary	\sf\mw\appsupport\filehandling\htmltorichtextconverter\group	all
diff -r 2e3d3ce01487 -r c4cbaa4fb734 filehandling/htmltorichtextconverter/group/distribution.policy.s60
--- a/filehandling/htmltorichtextconverter/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 filehandling/htmltorichtextconverter/inc/distribution.policy.s60
--- a/filehandling/htmltorichtextconverter/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 filehandling/htmltorichtextconverter/src/distribution.policy.s60
--- a/filehandling/htmltorichtextconverter/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 filehandling/htmltorichtextconverter/tdata/profiling/distribution.policy.s60
--- a/filehandling/htmltorichtextconverter/tdata/profiling/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 filehandling/htmltorichtextconverter/tdata/testHtml/distribution.policy.s60
--- a/filehandling/htmltorichtextconverter/tdata/testHtml/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 filehandling/htmltorichtextconverter/test/group/distribution.policy.s60
--- a/filehandling/htmltorichtextconverter/test/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 filehandling/htmltorichtextconverter/tsrc/Integration/TestHtmlToCrtCoverter/group/distribution.policy.s60
--- a/filehandling/htmltorichtextconverter/tsrc/Integration/TestHtmlToCrtCoverter/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 filehandling/htmltorichtextconverter/tsrc/Integration/TestHtmlToCrtCoverter/inc/distribution.policy.s60
--- a/filehandling/htmltorichtextconverter/tsrc/Integration/TestHtmlToCrtCoverter/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 filehandling/htmltorichtextconverter/tsrc/Integration/TestHtmlToCrtCoverter/scripts/distribution.policy.s60
--- a/filehandling/htmltorichtextconverter/tsrc/Integration/TestHtmlToCrtCoverter/scripts/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 filehandling/htmltorichtextconverter/tsrc/Integration/TestHtmlToCrtCoverter/src/distribution.policy.s60
--- a/filehandling/htmltorichtextconverter/tsrc/Integration/TestHtmlToCrtCoverter/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 filehandling/htmltorichtextconverter/tsrc/Integration/TestHtmlToCrtCoverter/testdata/distribution.policy.s60
--- a/filehandling/htmltorichtextconverter/tsrc/Integration/TestHtmlToCrtCoverter/testdata/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 filehandling/htmltorichtextconverter/tsrc/distribution.policy.s60
--- a/filehandling/htmltorichtextconverter/tsrc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 filehandling/richtexttohtmlconverter/Group/BLD.INF
--- a/filehandling/richtexttohtmlconverter/Group/BLD.INF	Tue Feb 02 10:12:00 2010 +0200
+++ b/filehandling/richtexttohtmlconverter/Group/BLD.INF	Fri Apr 16 15:08:06 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1997-2010 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"
@@ -17,6 +17,7 @@
 	DEFAULT
 
 PRJ_EXPORTS
+	./RichTextToHtmlConv.iby				/epoc32/rom/include/core/mw/richtexttohtmlconv.iby
 	./RichTextToHtmlConv.iby				/epoc32/rom/include/richtexttohtmlconv.iby
 
 PRJ_MMPFILES
diff -r 2e3d3ce01487 -r c4cbaa4fb734 filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp
--- a/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp	Tue Feb 02 10:12:00 2010 +0200
+++ b/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,3 +1,19 @@
+#
+# 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: 
+#
+
 component	app-services_richtexttohtmlconv
 source	\sf\mw\appsupport\filehandling\richtexttohtmlconverter
 binary	\sf\mw\appsupport\filehandling\richtexttohtmlconverter\Group	all
diff -r 2e3d3ce01487 -r c4cbaa4fb734 filehandling/richtexttohtmlconverter/Group/distribution.policy.s60
--- a/filehandling/richtexttohtmlconverter/Group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 filehandling/richtexttohtmlconverter/Src/distribution.policy.s60
--- a/filehandling/richtexttohtmlconverter/Src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 filehandling/richtexttohtmlconverter/TSrc/distribution.policy.s60
--- a/filehandling/richtexttohtmlconverter/TSrc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 filehandling/richtexttohtmlconverter/Test/distribution.policy.s60
--- a/filehandling/richtexttohtmlconverter/Test/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 filehandling/richtexttohtmlconverter/inc/distribution.policy.s60
--- a/filehandling/richtexttohtmlconverter/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 flashliteapi_3_1/Distribution.Policy.S60
--- a/flashliteapi_3_1/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
diff -r 2e3d3ce01487 -r c4cbaa4fb734 flashliteapi_3_1/group/Distribution.Policy.S60
--- a/flashliteapi_3_1/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
diff -r 2e3d3ce01487 -r c4cbaa4fb734 flashliteapi_3_1/mmi/Distribution.Policy.S60
--- a/flashliteapi_3_1/mmi/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 flashliteapi_3_1/mmi/inc/Distribution.Policy.S60
--- a/flashliteapi_3_1/mmi/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 flashliteapi_3_1/ns/Distribution.Policy.S60
--- a/flashliteapi_3_1/ns/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 flashliteapi_3_1/ns/inc/Distribution.Policy.S60
--- a/flashliteapi_3_1/ns/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 flashliteapi_3_1/viewerfw/Distribution.Policy.S60
--- a/flashliteapi_3_1/viewerfw/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
diff -r 2e3d3ce01487 -r c4cbaa4fb734 flashliteapi_3_1/viewerfw/inc/Distribution.Policy.S60
--- a/flashliteapi_3_1/viewerfw/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
diff -r 2e3d3ce01487 -r c4cbaa4fb734 group/Distribution.Policy.S60
--- a/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 hwresourceadaptation/hwresourcemgruiplugin/group/distribution.policy.s60
--- a/hwresourceadaptation/hwresourcemgruiplugin/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp
--- a/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp	Tue Feb 02 10:12:00 2010 +0200
+++ b/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,3 +1,19 @@
+#
+# 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: 
+#
+
 component	telephony_hwrmuiplugin
 source		\sf\mw\appsupport\hwresourceadaptation\hwresourcemgruiplugin
 binary		\sf\mw\appsupport\hwresourceadaptation\hwresourcemgruiplugin\group	all
diff -r 2e3d3ce01487 -r c4cbaa4fb734 hwresourceadaptation/hwresourcemgruiplugin/inc/distribution.policy.s60
--- a/hwresourceadaptation/hwresourcemgruiplugin/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 hwresourceadaptation/hwresourcemgruiplugin/rom/distribution.policy.s60
--- a/hwresourceadaptation/hwresourcemgruiplugin/rom/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 hwresourceadaptation/hwresourcemgruiplugin/src/distribution.policy.s60
--- a/hwresourceadaptation/hwresourcemgruiplugin/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 inc/Distribution.Policy.S60
--- a/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 layers.sysdef.xml
--- a/layers.sysdef.xml	Tue Feb 02 10:12:00 2010 +0200
+++ b/layers.sysdef.xml	Fri Apr 16 15:08:06 2010 +0300
@@ -12,6 +12,7 @@
       <module name="">
         <unit unitID="sydo.appsupport.appsupport_plat.flash_mmi_service_interface_custom_api" name="sydo_appsupport_appsupport_plat_flash_mmi_service_interface_custom_api" bldFile="&layer_real_source_path;/appsupport_plat/flash_mmi_service_interface_custom_api/group" mrp="" filter="!sf_build" />
         <unit unitID="sydo.appsupport.appsupport_plat.flash_netscape_plugin_command_api" name="sydo_appsupport_appsupport_plat_flash_netscape_plugin_command_api" bldFile="&layer_real_source_path;/appsupport_plat/flash_netscape_plugin_command_api/group" mrp="" filter="!sf_build" />
+        <unit unitID="sydo.appsupport.coreapplicationuis.atcmdplugin" name="sydo_appsupport_appsupport_coreapplicationuis_atcmdplugin" bldFile="&layer_real_source_path;/coreapplicationuis/atcmdplugin/group" mrp="" filter="!oem_build" />
       </module>
     </layer>
   </systemModel>
diff -r 2e3d3ce01487 -r c4cbaa4fb734 mediakeys/Distribution.Policy.S60
--- a/mediakeys/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 mediakeys/KeyPublisherPlugin/Distribution.Policy.S60
--- a/mediakeys/KeyPublisherPlugin/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 mediakeys/KeyPublisherPlugin/group/Distribution.Policy.S60
--- a/mediakeys/KeyPublisherPlugin/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 mediakeys/KeyPublisherPlugin/group/KeyPublisherPlugin.mmp
--- a/mediakeys/KeyPublisherPlugin/group/KeyPublisherPlugin.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/mediakeys/KeyPublisherPlugin/group/KeyPublisherPlugin.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -18,7 +18,7 @@
 
 #include <platform_paths.hrh>
 
-TARGET          KeyPublisherPlugin.DLL
+TARGET          keypublisherplugin.dll
 TARGETTYPE      ani
 UID             0x10003B22 0x1020724B
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 mediakeys/KeyPublisherPlugin/inc/Distribution.Policy.S60
--- a/mediakeys/KeyPublisherPlugin/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 mediakeys/KeyPublisherPlugin/src/Distribution.Policy.S60
--- a/mediakeys/KeyPublisherPlugin/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 mediakeys/MMKeyBearer/Distribution.Policy.S60
--- a/mediakeys/MMKeyBearer/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 mediakeys/MMKeyBearer/group/Distribution.Policy.S60
--- a/mediakeys/MMKeyBearer/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 mediakeys/MMKeyBearer/group/MMKeyBearer.mmp
--- a/mediakeys/MMKeyBearer/group/MMKeyBearer.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/mediakeys/MMKeyBearer/group/MMKeyBearer.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002-2008 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2002-2010 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"
@@ -21,7 +21,7 @@
 #include <platform_paths.hrh>
 
 
-TARGET			MMKeyBearer.dll
+TARGET			mmkeybearer.dll
 
 // CAPABILITY      CAP_ECOM_PLUGIN 
 // capabilities are required as that of remconbearerplugin.dll
@@ -41,7 +41,7 @@
 SOURCEPATH      .
 
 START RESOURCE 10207235.rss
-target MMKeyBearer.rsc
+target mmkeybearer.rsc
 END
 
 
@@ -52,15 +52,14 @@
 MW_LAYER_SYSTEMINCLUDE
 
 LIBRARY 		euser.lib 
-LIBRARY			ECom.lib
+LIBRARY			ecom.lib
 LIBRARY 		c32.lib 
 LIBRARY 		remconbearerplugin.lib 
 LIBRARY 		remcontypes.lib
 LIBRARY 		flogger.lib
-LIBRARY         avkon.lib
-LIBRARY         akncapserverclient.lib
 LIBRARY         apparc.lib
 LIBRARY         eikcore.lib
+LIBRARY         lockclient.lib
 
 #include <comms-infras/commsdebugutility.mmh>
 #include "../../group/mediakeys.mmh"
diff -r 2e3d3ce01487 -r c4cbaa4fb734 mediakeys/MMKeyBearer/inc/Distribution.Policy.S60
--- a/mediakeys/MMKeyBearer/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 mediakeys/MMKeyBearer/inc/MMKeyBearerImplementation.h
--- a/mediakeys/MMKeyBearer/inc/MMKeyBearerImplementation.h	Tue Feb 02 10:12:00 2010 +0200
+++ b/mediakeys/MMKeyBearer/inc/MMKeyBearerImplementation.h	Fri Apr 16 15:08:06 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2005-2010 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"
@@ -26,7 +26,9 @@
 #include <remcon/remconbearerplugin.h>
 #include <remcon/remconbearerinterface.h>
 #include <remcon/messagetype.h>
-#include <AknCapServerClient.h>
+#include <keyguardaccessapi.h>
+
+
 
 #include "MMKeyBearerObserverPS.h"
 
@@ -155,8 +157,7 @@
         RProperty iProperty;
         
         // For keylock interaction
-        RAknUiServer iAknServer;
-        TBool iAknServerConnected;
-    };
+        CKeyguardAccessApi* iKeyguardAccess;
+        };
 
 #endif // __MMKEYBEARERIMPLEMENTATION_H__
diff -r 2e3d3ce01487 -r c4cbaa4fb734 mediakeys/MMKeyBearer/src/Distribution.Policy.S60
--- a/mediakeys/MMKeyBearer/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 mediakeys/MMKeyBearer/src/MMKeyBearerImplementation.cpp
--- a/mediakeys/MMKeyBearer/src/MMKeyBearerImplementation.cpp	Tue Feb 02 10:12:00 2010 +0200
+++ b/mediakeys/MMKeyBearer/src/MMKeyBearerImplementation.cpp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005-2008 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2005-2010 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"
@@ -26,6 +26,7 @@
 #include <UsbWatcherInternalPSKeys.h>
 #include <usbpersonalityids.h>
 #include <PSVariables.h>   // Property values
+#include <keyguardaccessapi.h>
 
 // Include this once it is exported
 // #include <RemConExtensionApi.h>
@@ -74,7 +75,7 @@
     delete iMediaKeyObserver;
     delete iAccessoryVolKeyObserver;
     delete iUSBFileTransferObserver;
-    iAknServer.Close();
+    delete iKeyguardAccess;
     }
 
 // ---------------------------------------------------------
@@ -84,11 +85,10 @@
 //
 CMMKeyBearer::CMMKeyBearer(TBearerParams& aParams)
 :   CRemConBearerPlugin(aParams),
-    iUSBFileTransfer(KUsbWatcherSelectedPersonalityNone),
-    iAknServerConnected(EFalse)
+    iUSBFileTransfer(KUsbWatcherSelectedPersonalityNone)
     {
     FUNC_LOG;
-
+    
     //Pass
     }
 
@@ -105,6 +105,7 @@
     TRemConAddress addr;
     addr.BearerUid() = Uid();
     TInt err = Observer().ConnectIndicate(addr);
+    iKeyguardAccess = CKeyguardAccessApi::NewL();
 
     // Start Active object for listening key events from P&S
     TRAP_AND_LEAVE(
@@ -361,30 +362,10 @@
     // If events are from accessory device,then do not check for keypadlock
     if (aKeyType != EAccessoryVolumeKeys)
         {
-        TBool keysLocked = EFalse;
-        if (!(iAknServerConnected))  // Connect to server for first time
-            {
-            if(iAknServer.Connect() == KErrNone)
-                {
-                iAknServerConnected = ETrue;
-                }
-            else                   // If connection fails, then return
-                {
-                //Start the listener once again
-               if (aKeyType == ESideVolumeKeys)
-                    {
-                    iMMKeyBearerObserver->Start();
-                    }
-                if (aKeyType == EMediaKeys)
-                    {
-                    iMediaKeyObserver->Start();
-                    }
-                return ;
-                }
-            }
-        iAknServer.ShowKeysLockedNote(keysLocked);
+               
+        TInt err=iKeyguardAccess->ShowKeysLockedNote();
 
-        if (keysLocked)
+        if (err==KErrNone)
             {
             // Device is locked , Discard the key event
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 mediakeys/group/Distribution.Policy.S60
--- a/mediakeys/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 mediakeys/inc/Distribution.Policy.S60
--- a/mediakeys/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 mediakeys/rom/Distribution.Policy.S60
--- a/mediakeys/rom/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/copydatafile/group/distribution.policy.s60
--- a/openenvutils/commandshell/copydatafile/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/copydatafile/inc/distribution.policy.s60
--- a/openenvutils/commandshell/copydatafile/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/copydatafile/src/distribution.policy.s60
--- a/openenvutils/commandshell/copydatafile/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/docs/test/SGL.GT0355.203 v1.0 PREQ1459_Test Specification.doc
Binary file openenvutils/commandshell/docs/test/SGL.GT0355.203 v1.0 PREQ1459_Test Specification.doc has changed
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/docs/test/distribution.policy.s60
--- a/openenvutils/commandshell/docs/test/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/group/distribution.policy.s60
--- a/openenvutils/commandshell/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/group/oetools_zsh.mrp
--- a/openenvutils/commandshell/group/oetools_zsh.mrp	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/group/oetools_zsh.mrp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,3 +1,19 @@
+#
+# 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: 
+#
+
 component oetools_zsh
 source \sf\mw\appsupport\openenvutils\commandshell
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/cat/src/cat.c
--- a/openenvutils/commandshell/shell/commands/cat/src/cat.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/commands/cat/src/cat.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-// cat.c
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/cat/src/distribution.policy.s60
--- a/openenvutils/commandshell/shell/commands/cat/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/cp/inc/distribution.policy.s60
--- a/openenvutils/commandshell/shell/commands/cp/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/cp/src/cp.c
--- a/openenvutils/commandshell/shell/commands/cp/src/cp.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/commands/cp/src/cp.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,8 +1,23 @@
 /*	$Id: cp.c,v 1.2 2000/08/14 16:26:08 amai Exp $	*/
 /*	$NetBSD: cp.c,v 1.14 1995/09/07 06:14:51 jtc Exp $	*/
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007-2008. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * Copyright (c) 1988, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/cp/src/cputils.c
--- a/openenvutils/commandshell/shell/commands/cp/src/cputils.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/commands/cp/src/cputils.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,24 @@
 /*	$Id: utils.c,v 1.2 2000/08/14 16:26:08 amai Exp $	*/
 /*	$NetBSD: utils.c,v 1.6 1997/02/26 14:40:51 cgd Exp $	*/
 
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*-
  * Copyright (c) 1991, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/cp/src/distribution.policy.s60
--- a/openenvutils/commandshell/shell/commands/cp/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/find/docs/distribution.policy.s60
--- a/openenvutils/commandshell/shell/commands/find/docs/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/find/docs/findmanual.doc
Binary file openenvutils/commandshell/shell/commands/find/docs/findmanual.doc has changed
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/find/group/distribution.policy.s60
--- a/openenvutils/commandshell/shell/commands/find/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/find/inc/distribution.policy.s60
--- a/openenvutils/commandshell/shell/commands/find/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/find/inc/namespace.h
--- a/openenvutils/commandshell/shell/commands/find/inc/namespace.h	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/commands/find/inc/namespace.h	Fri Apr 16 15:08:06 2010 +0300
@@ -1,3 +1,19 @@
+/*
+* 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: 
+*
+*/
 #ifndef __NAMESPACE_H__
 #define __NAMESPACE_H__
 /* ______________________________________________________________________
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/find/src/distribution.policy.s60
--- a/openenvutils/commandshell/shell/commands/find/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/find/src/find.c
--- a/openenvutils/commandshell/shell/commands/find/src/find.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/commands/find/src/find.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,6 +1,25 @@
 /*	$NetBSD: find.c,v 1.23 2006/10/11 19:51:10 apb Exp $	*/
 
-/*-© Portions copyright (c) 2007 Symbian Software Ltd.  All rights reserved.
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
+
+/*-
  * Copyright (c) 1991, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/find/src/fnmatch.c
--- a/openenvutils/commandshell/shell/commands/find/src/fnmatch.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/commands/find/src/fnmatch.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,6 +1,25 @@
 /*	$NetBSD: fnmatch.c,v 1.21 2005/12/24 21:11:16 perry Exp $	*/
 
-/* © Portions copyright (c) 2007 Symbian Software Ltd.  All rights reserved.
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
+
+/* 
  * Copyright (c) 1989, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/find/src/function.c
--- a/openenvutils/commandshell/shell/commands/find/src/function.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/commands/find/src/function.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,6 +1,25 @@
 /*	$NetBSD: function.c,v 1.62 2007/02/06 13:25:01 elad Exp $	*/
 
-/*-© Portions copyright (c) 2007 Symbian Software Ltd.  All rights reserved.
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
+
+/*-© 
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/find/src/ls.c
--- a/openenvutils/commandshell/shell/commands/find/src/ls.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/commands/find/src/ls.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,6 +1,25 @@
 /*	$NetBSD: ls.c,v 1.19 2006/10/11 19:51:10 apb Exp $	*/
 
-/*-  © Portions copyright (c) 2007 Symbian Software Ltd.  All rights reserved.
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
+
+/*-  © 
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/find/src/main.c
--- a/openenvutils/commandshell/shell/commands/find/src/main.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/commands/find/src/main.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,26 @@
 
 /*	$NetBSD: main.c,v 1.26 2006/11/09 20:50:53 christos Exp $	*/
 
-/*- © Portions copyright (c) 2007-2008 Symbian Software Ltd.  All rights reserved.
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
+
+/*- © 
  * Copyright (c) 1990, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/find/src/misc.c
--- a/openenvutils/commandshell/shell/commands/find/src/misc.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/commands/find/src/misc.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,6 +1,25 @@
 /*	$NetBSD: misc.c,v 1.14 2006/10/11 19:51:10 apb Exp $	*/
 
-/*- © Portions copyright (c) 2007 Symbian Software Ltd.  All rights reserved.
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
+
+/*- © 
  * Copyright (c) 1990, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/find/src/namespace.c
--- a/openenvutils/commandshell/shell/commands/find/src/namespace.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/commands/find/src/namespace.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,3 +1,19 @@
+/*
+* 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: 
+*
+*/
 /* ______________________________________________________________________
    namespace.c
    $Id: namespace.c,v 1.1 2003/06/29 00:22:47 jriehl Exp $
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/find/src/options.c
--- a/openenvutils/commandshell/shell/commands/find/src/options.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/commands/find/src/options.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,6 +1,24 @@
 /*	$NetBSD: options.c,v 1.26 2007/02/06 15:33:22 perry Exp $	*/
 
-/*-  © Portions copyright (c) 2007 Symbian Software Ltd.  All rights reserved.
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
+/*-  © 
  * Copyright (c) 1990, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/grep/docs/distribution.policy.s60
--- a/openenvutils/commandshell/shell/commands/grep/docs/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/grep/docs/manualforgrep.doc
Binary file openenvutils/commandshell/shell/commands/grep/docs/manualforgrep.doc has changed
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/grep/group/distribution.policy.s60
--- a/openenvutils/commandshell/shell/commands/grep/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/grep/inc/distribution.policy.s60
--- a/openenvutils/commandshell/shell/commands/grep/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/grep/inc/grep.h
--- a/openenvutils/commandshell/shell/commands/grep/inc/grep.h	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/commands/grep/inc/grep.h	Fri Apr 16 15:08:06 2010 +0300
@@ -1,4 +1,21 @@
-/* © Portions copyright (c) 2007 Symbian Software Ltd.  All rights reserved.*/
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*	$NetBSD: grep.h,v 1.3 2006/05/15 21:12:21 rillig Exp $	*/
 
 /*-
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/grep/inc/namespace.h
--- a/openenvutils/commandshell/shell/commands/grep/inc/namespace.h	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/commands/grep/inc/namespace.h	Fri Apr 16 15:08:06 2010 +0300
@@ -1,3 +1,19 @@
+/*
+* 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: 
+*
+*/
 #ifndef __NAMESPACE_H__
 #define __NAMESPACE_H__
 /* ______________________________________________________________________
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/grep/src/distribution.policy.s60
--- a/openenvutils/commandshell/shell/commands/grep/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/grep/src/file.c
--- a/openenvutils/commandshell/shell/commands/grep/src/file.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/commands/grep/src/file.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,4 +1,21 @@
-/* © Portions copyright (c) 2007 Symbian Software Ltd.  All rights reserved.*/
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*	$NetBSD: file.c,v 1.2 2006/05/15 21:12:21 rillig Exp $	*/
 
 /*-
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/grep/src/grep.c
--- a/openenvutils/commandshell/shell/commands/grep/src/grep.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/commands/grep/src/grep.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,4 +1,21 @@
-/* © Portions copyright (c) 2007-2008 Symbian Software Ltd.  All rights reserved.*/
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*	$NetBSD: grep.c,v 1.3 2006/05/15 21:12:21 rillig Exp $	*/
 
 /*-
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/grep/src/mmfile.c
--- a/openenvutils/commandshell/shell/commands/grep/src/mmfile.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/commands/grep/src/mmfile.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,4 +1,21 @@
-/*© Portions copyright (c) 2007 Symbian Software Ltd.  All rights reserved.*/
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*	$NetBSD: mmfile.c,v 1.3 2006/05/15 21:12:21 rillig Exp $	*/
 
 /*-
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/grep/src/namespace.c
--- a/openenvutils/commandshell/shell/commands/grep/src/namespace.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/commands/grep/src/namespace.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,3 +1,19 @@
+/*
+* 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: 
+*
+*/
 /* ______________________________________________________________________
    namespace.c
    $Id: namespace.c,v 1.1 2003/06/29 00:22:47 jriehl Exp $
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/grep/src/util.c
--- a/openenvutils/commandshell/shell/commands/grep/src/util.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/commands/grep/src/util.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,4 +1,21 @@
-/* © Portions copyright (c) 2007-2008 Symbian Software Ltd.  All rights reserved.*/
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*	$NetBSD: util.c,v 1.4 2006/05/15 21:12:21 rillig Exp $	*/
 
 /*-
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/inc/distribution.policy.s60
--- a/openenvutils/commandshell/shell/commands/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/inc/err.h
--- a/openenvutils/commandshell/shell/commands/inc/err.h	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/commands/inc/err.h	Fri Apr 16 15:08:06 2010 +0300
@@ -1,5 +1,22 @@
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
 /*-
- * © Portions copyright (c) 2007 Symbian Software Ltd.  All rights reserved.
+ * © 
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/ls/inc/distribution.policy.s60
--- a/openenvutils/commandshell/shell/commands/ls/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/ls/src/cmp.c
--- a/openenvutils/commandshell/shell/commands/ls/src/cmp.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/commands/ls/src/cmp.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,25 @@
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*	$Id: cmp.c,v 1.2 2000/08/22 22:20:23 amai Exp $	*/
 /*	$NetBSD: cmp.c,v 1.10 1996/07/08 10:32:01 mycroft Exp $	*/
 //
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
+// © 
 //
 /*
  * Copyright (c) 1989, 1993
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/ls/src/distribution.policy.s60
--- a/openenvutils/commandshell/shell/commands/ls/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/ls/src/getbsize.c
--- a/openenvutils/commandshell/shell/commands/ls/src/getbsize.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/commands/ls/src/getbsize.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,6 +1,25 @@
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
+
 //getbsize.c
 //
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
+// © 
 //
 /*-
  * Copyright (c) 1991, 1993
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/ls/src/ls.c
--- a/openenvutils/commandshell/shell/commands/ls/src/ls.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/commands/ls/src/ls.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,26 @@
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
+
 /*	$Id: ls.c,v 1.2 2000/08/22 22:20:23 amai Exp $	*/
 /*	$NetBSD: ls.c,v 1.18 1996/07/09 09:16:29 mycroft Exp $	*/
 //
-// © Portions Copyright (c) Symbian Software Ltd 2007-2008. All rights reserved.
+// © 
 //
 /*
  * Copyright (c) 1989, 1993, 1994
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/ls/src/print.c
--- a/openenvutils/commandshell/shell/commands/ls/src/print.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/commands/ls/src/print.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,26 @@
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
+
 /*	$Id: print.c,v 1.2 2000/08/22 22:20:24 amai Exp $	*/
 /*	$NetBSD: print.c,v 1.15 1996/12/11 03:25:39 thorpej Exp $	*/
 //
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
+// © 
 //
 /*
  * Copyright (c) 1989, 1993, 1994
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/ls/src/stat_flags.c
--- a/openenvutils/commandshell/shell/commands/ls/src/stat_flags.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/commands/ls/src/stat_flags.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,26 @@
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
+
 /*	$Id: stat_flags.c,v 1.3 2000/08/26 09:22:51 amai Exp $	*/
 /*	$NetBSD: stat_flags.c,v 1.5 1995/09/07 06:43:01 jtc Exp $	*/
 //
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
+// © 
 //
 /*-
  * Copyright (c) 1993
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/ls/src/util.c
--- a/openenvutils/commandshell/shell/commands/ls/src/util.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/commands/ls/src/util.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,25 @@
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*	$Id: util.c,v 1.2 2000/08/22 22:20:24 amai Exp $	*/
 /*	$NetBSD: util.c,v 1.12 1995/09/07 06:43:02 jtc Exp $	*/
 //
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
+// © 
 //
 /*
  * Copyright (c) 1989, 1993, 1994
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/ps/docs/distribution.policy.s60
--- a/openenvutils/commandshell/shell/commands/ps/docs/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/ps/docs/pscommand.doc
Binary file openenvutils/commandshell/shell/commands/ps/docs/pscommand.doc has changed
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/ps/group/distribution.policy.s60
--- a/openenvutils/commandshell/shell/commands/ps/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/ps/inc/distribution.policy.s60
--- a/openenvutils/commandshell/shell/commands/ps/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/ps/src/distribution.policy.s60
--- a/openenvutils/commandshell/shell/commands/ps/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/src/distribution.policy.s60
--- a/openenvutils/commandshell/shell/commands/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/src/err.c
--- a/openenvutils/commandshell/shell/commands/src/err.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/commands/src/err.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,5 +1,23 @@
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*-
- * © Portions copyright (c) 2007 Symbian Software Ltd.  All rights reserved.
+ * © 
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/src/fts.c
--- a/openenvutils/commandshell/shell/commands/src/fts.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/commands/src/fts.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,6 +1,24 @@
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*	$Id: fts.c,v 1.5 2000/11/25 16:33:36 arnd Exp $	*/
 //
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
+// © 
 //
 /*-
  * Copyright (c) 1990, 1993, 1994
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/touch/src/distribution.policy.s60
--- a/openenvutils/commandshell/shell/commands/touch/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/touch/src/touch.c
--- a/openenvutils/commandshell/shell/commands/touch/src/touch.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/commands/touch/src/touch.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,24 @@
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
 /*	$OpenBSD: touch.c,v 1.3 1997/01/15 23:43:22 millert Exp $	*/
 /*	$NetBSD: touch.c,v 1.11 1995/08/31 22:10:06 jtc Exp $	*/
 //
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
+// © 
 //
 /*
  * Copyright (c) 1993
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/unzip/group/distribution.policy.s60
--- a/openenvutils/commandshell/shell/commands/unzip/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/unzip/inc/distribution.policy.s60
--- a/openenvutils/commandshell/shell/commands/unzip/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/unzip/inc/unzip.h
--- a/openenvutils/commandshell/shell/commands/unzip/inc/unzip.h	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/commands/unzip/inc/unzip.h	Fri Apr 16 15:08:06 2010 +0300
@@ -1,8 +1,24 @@
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /* unzip.h -- IO for uncompress .zip files using zlib
    Version 1.01e, February 12th, 2005
 
-   Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved.
-   
    Copyright (C) 1998-2005 Gilles Vollant
 
    This unzip package allow extract file from .ZIP file, compatible with PKZip 2.04g
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/unzip/src/distribution.policy.s60
--- a/openenvutils/commandshell/shell/commands/unzip/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/unzip/src/ioapi.c
--- a/openenvutils/commandshell/shell/commands/unzip/src/ioapi.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/commands/unzip/src/ioapi.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,10 +1,27 @@
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /* ioapi.c -- IO base function header for compress/uncompress .zip
    files using zlib + zip or unzip API
 
    Version 1.01e, February 12th, 2005
 
-   Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved.
-   
+      
    Copyright (C) 1998-2005 Gilles Vollant    
    
 */
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/unzip/src/miniunz.c
--- a/openenvutils/commandshell/shell/commands/unzip/src/miniunz.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/commands/unzip/src/miniunz.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,8 +1,25 @@
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
    miniunz.c
    Version 1.01e, February 12th, 2005
 
-   Portions copyright (c) 2007-2008 Symbian Software Ltd. All rights reserved.
    Copyright (C) 1998-2005 Gilles Vollant
    
 */
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/unzip/src/unzip.c
--- a/openenvutils/commandshell/shell/commands/unzip/src/unzip.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/commands/unzip/src/unzip.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,8 +1,25 @@
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /* unzip.c -- IO for uncompress .zip files using zlib
    Version 1.01e, February 12th, 2005
 
-   Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved.
-  
+ 
    Copyright (C) 1998-2005 Gilles Vollant
 
    Read unzip.h for more info
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/zip/group/distribution.policy.s60
--- a/openenvutils/commandshell/shell/commands/zip/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/zip/inc/distribution.policy.s60
--- a/openenvutils/commandshell/shell/commands/zip/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/zip/inc/zip.h
--- a/openenvutils/commandshell/shell/commands/zip/inc/zip.h	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/commands/zip/inc/zip.h	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,24 @@
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /* zip.h -- IO for compress .zip files using zlib
    Version 1.01e, February 12th, 2005
 
-   Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved.
    
    Copyright (C) 1998-2005 Gilles Vollant
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/zip/src/distribution.policy.s60
--- a/openenvutils/commandshell/shell/commands/zip/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/zip/src/ioapi.c
--- a/openenvutils/commandshell/shell/commands/zip/src/ioapi.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/commands/zip/src/ioapi.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,10 +1,27 @@
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /* ioapi.c -- IO base function header for compress/uncompress .zip
    files using zlib + zip or unzip API
 
    Version 1.01e, February 12th, 2005
 
-   Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved.
-   
+  
    Copyright (C) 1998-2005 Gilles Vollant
 
 */
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/zip/src/minizip.c
--- a/openenvutils/commandshell/shell/commands/zip/src/minizip.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/commands/zip/src/minizip.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,9 +1,24 @@
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
 /*
    minizip.c
    Version 1.01e, February 12th, 2005
 
-   Portions copyright (c) 2007-2008 Symbian Software Ltd. All rights reserved.
-   
    Copyright (C) 1998-2005 Gilles Vollant
 */
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/commands/zip/src/zip.c
--- a/openenvutils/commandshell/shell/commands/zip/src/zip.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/commands/zip/src/zip.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,10 +1,26 @@
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
 /* zip.c -- IO on .zip files using zlib
    Version 1.01e, February 12th, 2005
 
    27 Dec 2004 Rolf Kalbermatter
    Modification to zipOpen2 to support globalComment retrieval.
 
-   Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved.
    
    Copyright (C) 1998-2005 Gilles Vollant
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/group/distribution.policy.s60
--- a/openenvutils/commandshell/shell/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/inc/.indent.pro
--- a/openenvutils/commandshell/shell/inc/.indent.pro	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/inc/.indent.pro	Fri Apr 16 15:08:06 2010 +0300
@@ -1,3 +1,19 @@
+#
+# 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: 
+#
+
 --dont-format-comments
 --procnames-start-lines
 --no-parameter-indentation
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/inc/distribution.policy.s60
--- a/openenvutils/commandshell/shell/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/inc/errcount.h
--- a/openenvutils/commandshell/shell/inc/errcount.h	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/inc/errcount.h	Fri Apr 16 15:08:06 2010 +0300
@@ -1,1 +1,18 @@
+/*
+* 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: 
+*
+*/
+
 #define ERRCOUNT	124
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/inc/poll.h
--- a/openenvutils/commandshell/shell/inc/poll.h	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/inc/poll.h	Fri Apr 16 15:08:06 2010 +0300
@@ -1,3 +1,22 @@
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
+
 /*-
  * Copyright (c) 1997 Peter Wemm <peter@freebsd.org>
  * All rights reserved.
@@ -24,7 +43,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * © Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved.
  * $FreeBSD: src/sys/sys/poll.h,v 1.13 2002/07/10 04:47:25 mike Exp $
  */
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/inc/rlimits.h
--- a/openenvutils/commandshell/shell/inc/rlimits.h	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/inc/rlimits.h	Fri Apr 16 15:08:06 2010 +0300
@@ -1,3 +1,19 @@
+/*
+* 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: 
+*
+*/
 /** rlimits.h                              **/
 /** architecture-customized limits for zsh **/
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/inc/sigcount.h
--- a/openenvutils/commandshell/shell/inc/sigcount.h	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/inc/sigcount.h	Fri Apr 16 15:08:06 2010 +0300
@@ -1,2 +1,19 @@
+/*
+* 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: 
+*
+*/
+
 #define SIGCOUNT	31
 #define sigmsg(sig) ((sig) <= SIGCOUNT ? sig_msg[sig] : "unknown signal")
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/inc/tcp.h
--- a/openenvutils/commandshell/shell/inc/tcp.h	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/inc/tcp.h	Fri Apr 16 15:08:06 2010 +0300
@@ -1,6 +1,21 @@
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * tcp.h - builtin FTP client
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/inc/termios.h
--- a/openenvutils/commandshell/shell/inc/termios.h	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/inc/termios.h	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-//termios.h
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*-
  * Copyright (c) 1988, 1989, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/inc/version.h
--- a/openenvutils/commandshell/shell/inc/version.h	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/inc/version.h	Fri Apr 16 15:08:06 2010 +0300
@@ -1,1 +1,18 @@
+/*
+* 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: 
+*
+*/
+
 #define ZSH_VERSION "4.2.6"
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/inc/zle_widget.h
--- a/openenvutils/commandshell/shell/inc/zle_widget.h	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/inc/zle_widget.h	Fri Apr 16 15:08:06 2010 +0300
@@ -1,3 +1,19 @@
+/*
+* 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: 
+*
+*/
 /** zle_widget.h                                **/
 /** indices of and pointers to internal widgets **/
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/inc/zshpaths.h
--- a/openenvutils/commandshell/shell/inc/zshpaths.h	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/inc/zshpaths.h	Fri Apr 16 15:08:06 2010 +0300
@@ -1,3 +1,20 @@
+/*
+* 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: 
+*
+*/
+
 #define MODULE_DIR "/usr/local/lib/zsh/4.2.6"
 #define SITEFPATH_DIR "/usr/local/share/zsh/site-functions"
 #define FPATH_DIR "/usr/local/share/zsh/4.2.6/functions"
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/inc/zshxmods.h
--- a/openenvutils/commandshell/shell/inc/zshxmods.h	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/inc/zshxmods.h	Fri Apr 16 15:08:06 2010 +0300
@@ -1,3 +1,20 @@
+/*
+* 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: 
+*
+*/
+
 #define LINKED_XMOD_zshQsmain 1
 #ifdef DYNAMIC
 # define UNLINKED_XMOD_zshQsrlimits 1
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/builtin.c
--- a/openenvutils/commandshell/shell/src/builtin.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/builtin.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,20 @@
-//builtin.c - builtin commands
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007 - 2008. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
 /*
  * This file is part of zsh, the Z shell.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/builtins/distribution.policy.s60
--- a/openenvutils/commandshell/shell/src/builtins/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/builtins/rlimits.c
--- a/openenvutils/commandshell/shell/src/builtins/rlimits.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/builtins/rlimits.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-//rlimits.c - resource limit builtins
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * This file is part of zsh, the Z shell.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/builtins/sched.c
--- a/openenvutils/commandshell/shell/src/builtins/sched.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/builtins/sched.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-// sched.c - execute commands at scheduled times
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * This file is part of zsh, the Z shell.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/compat.c
--- a/openenvutils/commandshell/shell/src/compat.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/compat.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,6 +1,21 @@
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /* 
  * compat.c - compatibility routines for the deprived
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/distribution.policy.s60
--- a/openenvutils/commandshell/shell/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/exec.c
--- a/openenvutils/commandshell/shell/src/exec.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/exec.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-// exec.c - command execution
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007 - 2008. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * This file is part of zsh, the Z shell.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/glob.c
--- a/openenvutils/commandshell/shell/src/glob.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/glob.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-//glob.c - filename generation
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * This file is part of zsh, the Z shell.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/hashtable.c
--- a/openenvutils/commandshell/shell/src/hashtable.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/hashtable.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-//hashtable.c - hash tables
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * This file is part of zsh, the Z shell.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/hist.c
--- a/openenvutils/commandshell/shell/src/hist.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/hist.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-//hist.c - history expansion
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * This file is part of zsh, the Z shell.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/init.c
--- a/openenvutils/commandshell/shell/src/init.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/init.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-//init.c - main loop and initialization routines
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007-2008. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * This file is part of zsh, the Z shell.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/input.c
--- a/openenvutils/commandshell/shell/src/input.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/input.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-//input.c - read and store lines of input
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * This file is part of zsh, the Z shell.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/jobs.c
--- a/openenvutils/commandshell/shell/src/jobs.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/jobs.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-// jobs.c - job control
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * This file is part of zsh, the Z shell.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/lex.c
--- a/openenvutils/commandshell/shell/src/lex.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/lex.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-// lex.c - lexical analysis
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007-2008. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * This file is part of zsh, the Z shell.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/linklist.c
--- a/openenvutils/commandshell/shell/src/linklist.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/linklist.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-// linklist.c - linked lists
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * This file is part of zsh, the Z shell.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/loop.c
--- a/openenvutils/commandshell/shell/src/loop.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/loop.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-// loop.c - loop execution
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * This file is part of zsh, the Z shell.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/math.c
--- a/openenvutils/commandshell/shell/src/math.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/math.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-// math.c - mathematical expression evaluation
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * This file is part of zsh, the Z shell.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/mem.c
--- a/openenvutils/commandshell/shell/src/mem.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/mem.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-// mem.c - memory management
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * This file is part of zsh, the Z shell.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/modentry.c
--- a/openenvutils/commandshell/shell/src/modentry.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/modentry.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,3 +1,20 @@
+/*
+* 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: 
+*
+*/
+
 #include "zsh.mdh"
 
 int setup_ _((Module));
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/module.c
--- a/openenvutils/commandshell/shell/src/module.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/module.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-// module.c - deal with dynamic modules
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * This file is part of zsh, the Z shell.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/modules/cap.c
--- a/openenvutils/commandshell/shell/src/modules/cap.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/modules/cap.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-// cap.c - POSIX.1e (POSIX.6) capability set manipulation
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * This file is part of zsh, the Z shell.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/modules/clone.c
--- a/openenvutils/commandshell/shell/src/modules/clone.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/modules/clone.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,8 +1,22 @@
 #ifndef __SYMBIAN32__
-// clone.c - start a forked instance of the current shell on a new terminal
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * This file is part of zsh, the Z shell.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/modules/datetime.c
--- a/openenvutils/commandshell/shell/src/modules/datetime.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/modules/datetime.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-// datetime.c - parameter interface to langinfo via curses
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * This file is part of zsh, the Z shell.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/modules/distribution.policy.s60
--- a/openenvutils/commandshell/shell/src/modules/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/modules/errnames.c
--- a/openenvutils/commandshell/shell/src/modules/errnames.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/modules/errnames.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,3 +1,19 @@
+/*
+* 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: 
+*
+*/
 /** errnames.c                                 **/
 /** architecture-customized errnames.c for zsh **/
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/modules/example.c
--- a/openenvutils/commandshell/shell/src/modules/example.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/modules/example.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-// example.c - an example module for zsh
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * This file is part of zsh, the Z shell.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/modules/files.c
--- a/openenvutils/commandshell/shell/src/modules/files.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/modules/files.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-// files.c - file operation builtins
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * This file is part of zsh, the Z shell.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/modules/langinfo.c
--- a/openenvutils/commandshell/shell/src/modules/langinfo.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/modules/langinfo.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-// langinfo.c - parameter interface to langinfo via curses
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * This file is part of zsh, the Z shell.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/modules/mapfile.c
--- a/openenvutils/commandshell/shell/src/modules/mapfile.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/modules/mapfile.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-// mapfile.c - associative array interface to external files
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * This file is part of zsh, the Z shell.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/modules/mathfunc.c
--- a/openenvutils/commandshell/shell/src/modules/mathfunc.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/modules/mathfunc.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-// mathfunc.c - basic mathematical functions for use in math evaluations
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * This file is part of zsh, the Z shell.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/modules/parameter.c
--- a/openenvutils/commandshell/shell/src/modules/parameter.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/modules/parameter.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-// parameter.c - parameter interface to zsh internals
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * This file is part of zsh, the Z shell.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/modules/socket.c
--- a/openenvutils/commandshell/shell/src/modules/socket.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/modules/socket.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-// socket.c - Unix domain socket module
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * This file is part of zsh, the Z shell.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/modules/stat.c
--- a/openenvutils/commandshell/shell/src/modules/stat.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/modules/stat.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-// stat.c - stat builtin interface to system call
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * This file is part of zsh, the Z shell.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/modules/system.c
--- a/openenvutils/commandshell/shell/src/modules/system.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/modules/system.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-// sysread.c - interface to system read/write
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * This file is part of zsh, the Z shell.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/modules/tcp.c
--- a/openenvutils/commandshell/shell/src/modules/tcp.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/modules/tcp.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-// tcp.c - TCP module
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * This file is part of zsh, the Z shell.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/modules/termcap.c
--- a/openenvutils/commandshell/shell/src/modules/termcap.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/modules/termcap.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-// termcap.c - termcap manipulation through curses
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * This file is part of zsh, the Z shell.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/modules/terminfo.c
--- a/openenvutils/commandshell/shell/src/modules/terminfo.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/modules/terminfo.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-// terminfo.c - parameter interface to terminfo via curses
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * This file is part of zsh, the Z shell.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/modules/zftp.c
--- a/openenvutils/commandshell/shell/src/modules/zftp.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/modules/zftp.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,6 +1,21 @@
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * zftp.c - builtin FTP client
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/modules/zprof.c
--- a/openenvutils/commandshell/shell/src/modules/zprof.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/modules/zprof.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,6 +1,21 @@
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * zprof.c - a shell function profiling module for zsh
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/modules/zpty.c
--- a/openenvutils/commandshell/shell/src/modules/zpty.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/modules/zpty.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,22 @@
 #ifndef __SYMBIAN32__
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * zpty.c - sub-processes with pseudo terminals
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/modules/zselect.c
--- a/openenvutils/commandshell/shell/src/modules/zselect.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/modules/zselect.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,22 @@
 // zselect.c - builtin support for select system call
-//
-// © Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * This file is part of zsh, the Z shell.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/modules/zutil.c
--- a/openenvutils/commandshell/shell/src/modules/zutil.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/modules/zutil.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,8 +1,22 @@
 #ifndef __SYMBIAN32__
-// zutil.c - misc utilities
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * This file is part of zsh, the Z shell.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/options.c
--- a/openenvutils/commandshell/shell/src/options.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/options.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-// options.c - shell options
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * This file is part of zsh, the Z shell.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/params.c
--- a/openenvutils/commandshell/shell/src/params.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/params.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-// params.c - parameters
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007-2008. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * This file is part of zsh, the Z shell.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/parse.c
--- a/openenvutils/commandshell/shell/src/parse.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/parse.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-// parse.c - parser
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * This file is part of zsh, the Z shell.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/pattern.c
--- a/openenvutils/commandshell/shell/src/pattern.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/pattern.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,6 +1,21 @@
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * pattern.c - pattern matching
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/prompt.c
--- a/openenvutils/commandshell/shell/src/prompt.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/prompt.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,5 @@
-// prompt.c - construct zsh prompts
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+
+
 /*
  * This file is part of zsh, the Z shell.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/signals.c
--- a/openenvutils/commandshell/shell/src/signals.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/signals.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,5 @@
-// signals.c - signals handling code
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+
+
 /*
  * This file is part of zsh, the Z shell.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/signames.c
--- a/openenvutils/commandshell/shell/src/signames.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/signames.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,3 +1,19 @@
+/*
+* 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: 
+*
+*/
 /** signames.c                                 **/
 /** architecture-customized signames.c for zsh **/
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/subst.c
--- a/openenvutils/commandshell/shell/src/subst.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/subst.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,23 @@
-// subst.c - various substitutions
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
+
 /*
  * This file is part of zsh, the Z shell.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/utils.c
--- a/openenvutils/commandshell/shell/src/utils.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/utils.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-// utils.c - miscellaneous utilities
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * This file is part of zsh, the Z shell.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/src/watch.c
--- a/openenvutils/commandshell/shell/src/watch.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/src/watch.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,8 +1,22 @@
 #ifndef __SYMBIAN32__
-// watch.c - login/logout watching
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * This file is part of zsh, the Z shell.
  *
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/docs/Readme.txt
--- a/openenvutils/commandshell/shell/test/docs/Readme.txt	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-Tests to be run (order does not matter)
-
-1) . ./zshtests_auto1.sh
-2) . ./zshtests_auto2.sh
-3) . ./greptest2.sh > greptest2.txt
-4) . ./findtest1.sh > findtest1.txt
-
-5) . ./findtest2.sh > findtest2.txt
-6) . ./findtest3.sh > findtest3.txt
-
-7) . ./greptest1.sh > greptest1.txt
-
-
-Run Manually the following tests ( Do not redirect the output )
-
-1. readtest_manual.sh
-2. ls.sh
-3) . ./externalcmd_test.sh - This test will not have any output, but should not hang the shell
-4) zshtests_manual.sh
-5) Enter atleast 10 commands at the zsh prompt and then execute . ./fctest_manual.sh
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/docs/distribution.policy.s60
--- a/openenvutils/commandshell/shell/test/docs/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/group/distribution.policy.s60
--- a/openenvutils/commandshell/shell/test/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/scripts/aliastest.sh
--- a/openenvutils/commandshell/shell/test/scripts/aliastest.sh	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/test/scripts/aliastest.sh	Fri Apr 16 15:08:06 2010 +0300
@@ -1,17 +1,17 @@
-# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of the License "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:
-#
+// Copyright (c) 2007-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:
+//
 
 init()
     {
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/scripts/autoloadtest.sh
--- a/openenvutils/commandshell/shell/test/scripts/autoloadtest.sh	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/test/scripts/autoloadtest.sh	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/scripts/breaktest.sh
--- a/openenvutils/commandshell/shell/test/scripts/breaktest.sh	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/test/scripts/breaktest.sh	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/scripts/cdtest1.sh
--- a/openenvutils/commandshell/shell/test/scripts/cdtest1.sh	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/test/scripts/cdtest1.sh	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/scripts/cdtest2.sh
--- a/openenvutils/commandshell/shell/test/scripts/cdtest2.sh	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/test/scripts/cdtest2.sh	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/scripts/continuetest.sh
--- a/openenvutils/commandshell/shell/test/scripts/continuetest.sh	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/test/scripts/continuetest.sh	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/scripts/dirstest.sh
--- a/openenvutils/commandshell/shell/test/scripts/dirstest.sh	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/test/scripts/dirstest.sh	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/scripts/distribution.policy.s60
--- a/openenvutils/commandshell/shell/test/scripts/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/scripts/dottest.sh
--- a/openenvutils/commandshell/shell/test/scripts/dottest.sh	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/test/scripts/dottest.sh	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/scripts/evaltest.sh
--- a/openenvutils/commandshell/shell/test/scripts/evaltest.sh	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/test/scripts/evaltest.sh	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/scripts/exittest.sh
--- a/openenvutils/commandshell/shell/test/scripts/exittest.sh	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/test/scripts/exittest.sh	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/scripts/fctest.sh
--- a/openenvutils/commandshell/shell/test/scripts/fctest.sh	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/test/scripts/fctest.sh	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/scripts/fctest_manual.sh
--- a/openenvutils/commandshell/shell/test/scripts/fctest_manual.sh	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/test/scripts/fctest_manual.sh	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/scripts/findtest1.sh
--- a/openenvutils/commandshell/shell/test/scripts/findtest1.sh	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/test/scripts/findtest1.sh	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/scripts/findtest2.sh
--- a/openenvutils/commandshell/shell/test/scripts/findtest2.sh	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/test/scripts/findtest2.sh	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/scripts/findtest3.sh
--- a/openenvutils/commandshell/shell/test/scripts/findtest3.sh	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/test/scripts/findtest3.sh	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/scripts/functionstest.sh
--- a/openenvutils/commandshell/shell/test/scripts/functionstest.sh	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/test/scripts/functionstest.sh	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/scripts/greptest1.sh
--- a/openenvutils/commandshell/shell/test/scripts/greptest1.sh	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/test/scripts/greptest1.sh	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/scripts/greptest2.sh
--- a/openenvutils/commandshell/shell/test/scripts/greptest2.sh	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/test/scripts/greptest2.sh	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/scripts/ls.sh
--- a/openenvutils/commandshell/shell/test/scripts/ls.sh	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/test/scripts/ls.sh	Fri Apr 16 15:08:06 2010 +0300
@@ -1,4 +1,21 @@
-#opyright (c) Symbian Software Ltd 2007. All rights reserved.
+#
+# Copyright (c) 2007-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:
+#
+#
+
+
 #!/home/guest/vinodp/local/bin/zsh
 ###################################
 # Test cases for internal commands#
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/scripts/miniziptest.sh
--- a/openenvutils/commandshell/shell/test/scripts/miniziptest.sh	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/test/scripts/miniziptest.sh	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/scripts/printtest.sh
--- a/openenvutils/commandshell/shell/test/scripts/printtest.sh	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/test/scripts/printtest.sh	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/scripts/pstest.sh
--- a/openenvutils/commandshell/shell/test/scripts/pstest.sh	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/test/scripts/pstest.sh	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/scripts/pwdtest.sh
--- a/openenvutils/commandshell/shell/test/scripts/pwdtest.sh	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/test/scripts/pwdtest.sh	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/scripts/readtest_manual.sh
--- a/openenvutils/commandshell/shell/test/scripts/readtest_manual.sh	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/test/scripts/readtest_manual.sh	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/scripts/redirecttest.sh
--- a/openenvutils/commandshell/shell/test/scripts/redirecttest.sh	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/test/scripts/redirecttest.sh	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,7 @@
-# Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/scripts/sanity_auto.sh
--- a/openenvutils/commandshell/shell/test/scripts/sanity_auto.sh	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/test/scripts/sanity_auto.sh	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/scripts/setopttest.sh
--- a/openenvutils/commandshell/shell/test/scripts/setopttest.sh	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/test/scripts/setopttest.sh	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/scripts/settest.sh
--- a/openenvutils/commandshell/shell/test/scripts/settest.sh	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/test/scripts/settest.sh	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/scripts/shifttest.sh
--- a/openenvutils/commandshell/shell/test/scripts/shifttest.sh	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/test/scripts/shifttest.sh	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/scripts/typesettest1.sh
--- a/openenvutils/commandshell/shell/test/scripts/typesettest1.sh	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/test/scripts/typesettest1.sh	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/scripts/typesettest2.sh
--- a/openenvutils/commandshell/shell/test/scripts/typesettest2.sh	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/test/scripts/typesettest2.sh	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/scripts/unhashtest.sh
--- a/openenvutils/commandshell/shell/test/scripts/unhashtest.sh	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/test/scripts/unhashtest.sh	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/scripts/unsetopttest.sh
--- a/openenvutils/commandshell/shell/test/scripts/unsetopttest.sh	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/test/scripts/unsetopttest.sh	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/scripts/unsettest.sh
--- a/openenvutils/commandshell/shell/test/scripts/unsettest.sh	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/test/scripts/unsettest.sh	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/scripts/unziptest.sh
--- a/openenvutils/commandshell/shell/test/scripts/unziptest.sh	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/test/scripts/unziptest.sh	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/scripts/util_dot1.sh
--- a/openenvutils/commandshell/shell/test/scripts/util_dot1.sh	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/test/scripts/util_dot1.sh	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/scripts/util_set17.sh
--- a/openenvutils/commandshell/shell/test/scripts/util_set17.sh	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/test/scripts/util_set17.sh	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/scripts/util_source.sh
--- a/openenvutils/commandshell/shell/test/scripts/util_source.sh	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/test/scripts/util_source.sh	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/scripts/whencetest.sh
--- a/openenvutils/commandshell/shell/test/scripts/whencetest.sh	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/test/scripts/whencetest.sh	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/scripts/zshtests_auto1.sh
--- a/openenvutils/commandshell/shell/test/scripts/zshtests_auto1.sh	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/test/scripts/zshtests_auto1.sh	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/scripts/zshtests_auto2.sh
--- a/openenvutils/commandshell/shell/test/scripts/zshtests_auto2.sh	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/test/scripts/zshtests_auto2.sh	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/scripts/zshtests_manual.sh
--- a/openenvutils/commandshell/shell/test/scripts/zshtests_manual.sh	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/commandshell/shell/test/scripts/zshtests_manual.sh	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# 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".
 #
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/commandshell/shell/test/src/distribution.policy.s60
--- a/openenvutils/commandshell/shell/test/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/telnetserver/group/distribution.policy.s60
--- a/openenvutils/telnetserver/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/telnetserver/group/oetools_telnetd.mrp
--- a/openenvutils/telnetserver/group/oetools_telnetd.mrp	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/telnetserver/group/oetools_telnetd.mrp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,3 +1,19 @@
+#
+# 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: 
+#
+
 component oetools_telnetd
 source \sf\mw\appsupport\openenvutils\telnetserver
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/telnetserver/inc/distribution.policy.s60
--- a/openenvutils/telnetserver/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/telnetserver/inc/telnetd.h
--- a/openenvutils/telnetserver/inc/telnetd.h	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/telnetserver/inc/telnetd.h	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,23 @@
 //telnetd.h
 //
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/telnetserver/inc/termios.h
--- a/openenvutils/telnetserver/inc/termios.h	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/telnetserver/inc/termios.h	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-//termios.h
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*-
  * Copyright (c) 1988, 1989, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/telnetserver/src/authenc.c
--- a/openenvutils/telnetserver/src/authenc.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/telnetserver/src/authenc.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-// authenc.c
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/telnetserver/src/distribution.policy.s60
--- a/openenvutils/telnetserver/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/telnetserver/src/global.c
--- a/openenvutils/telnetserver/src/global.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/telnetserver/src/global.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-// global.c
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/telnetserver/src/mini_inetd.c
--- a/openenvutils/telnetserver/src/mini_inetd.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/telnetserver/src/mini_inetd.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-// mini_inetd.c
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * Copyright (c) 1995 - 2001 Kungliga Tekniska Hgskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/telnetserver/src/slc.c
--- a/openenvutils/telnetserver/src/slc.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/telnetserver/src/slc.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-// slc.c
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/telnetserver/src/state.c
--- a/openenvutils/telnetserver/src/state.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/telnetserver/src/state.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-// state.c
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/telnetserver/src/sys_term.c
--- a/openenvutils/telnetserver/src/sys_term.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/telnetserver/src/sys_term.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-// sys_term.c
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/telnetserver/src/telnetd.c
--- a/openenvutils/telnetserver/src/telnetd.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/telnetserver/src/telnetd.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-// telnetd.c
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007-2008. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/telnetserver/src/termstat.c
--- a/openenvutils/telnetserver/src/termstat.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/telnetserver/src/termstat.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-// termstat.c
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/telnetserver/src/utility.c
--- a/openenvutils/telnetserver/src/utility.c	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/telnetserver/src/utility.c	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-// utility.c
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-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:
+*
+*/
+
+
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/telnetserver/test/group/distribution.policy.s60
--- a/openenvutils/telnetserver/test/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/telnetserver/test/group/ethernetced_dynamicIP.xml
--- a/openenvutils/telnetserver/test/group/ethernetced_dynamicIP.xml	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/telnetserver/test/group/ethernetced_dynamicIP.xml	Fri Apr 16 15:08:06 2010 +0300
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+ Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
  All rights reserved.
  This component and the accompanying materials are made available
- under the terms of the License "Eclipse Public License v1.0"
+ 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".
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/telnetserver/test/group/ethernetced_staticIP.xml
--- a/openenvutils/telnetserver/test/group/ethernetced_staticIP.xml	Tue Feb 02 10:12:00 2010 +0200
+++ b/openenvutils/telnetserver/test/group/ethernetced_staticIP.xml	Fri Apr 16 15:08:06 2010 +0300
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+ Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
  All rights reserved.
  This component and the accompanying materials are made available
- under the terms of the License "Eclipse Public License v1.0"
+ 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".
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 openenvutils/telnetserver/test/utils/distribution.policy.s60
--- a/openenvutils/telnetserver/test/utils/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 printingsupport/printinguisupport/bwins/distribution.policy.s60
--- a/printingsupport/printinguisupport/bwins/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 printingsupport/printinguisupport/eabi/distribution.policy.s60
--- a/printingsupport/printinguisupport/eabi/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 printingsupport/printinguisupport/group/PRINTSDK.DOC
Binary file printingsupport/printinguisupport/group/PRINTSDK.DOC has changed
diff -r 2e3d3ce01487 -r c4cbaa4fb734 printingsupport/printinguisupport/group/app-framework_print.mrp
--- a/printingsupport/printinguisupport/group/app-framework_print.mrp	Tue Feb 02 10:12:00 2010 +0200
+++ b/printingsupport/printinguisupport/group/app-framework_print.mrp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,3 +1,19 @@
+#
+# 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: 
+#
+
 component	app-framework_print
 source	\sf\mw\appsupport\printingsupport\printinguisupport
 binary	\sf\mw\appsupport\printingsupport\printinguisupport\group	all
diff -r 2e3d3ce01487 -r c4cbaa4fb734 printingsupport/printinguisupport/group/distribution.policy.s60
--- a/printingsupport/printinguisupport/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 printingsupport/printinguisupport/inc/distribution.policy.s60
--- a/printingsupport/printinguisupport/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 printingsupport/printinguisupport/src_prev/distribution.policy.s60
--- a/printingsupport/printinguisupport/src_prev/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 printingsupport/printinguisupport/src_prn/distribution.policy.s60
--- a/printingsupport/printinguisupport/src_prn/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 printingsupport/printinguisupport/tef/distribution.policy.s60
--- a/printingsupport/printinguisupport/tef/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 printingsupport/printinguisupport/tef/scripts/distribution.policy.s60
--- a/printingsupport/printinguisupport/tef/scripts/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Distribution.Policy.S60
--- a/startupservices/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/SplashScreen/Bwins/Distribution.Policy.S60
--- a/startupservices/SplashScreen/Bwins/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/SplashScreen/Data/Distribution.Policy.S60
--- a/startupservices/SplashScreen/Data/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/SplashScreen/Distribution.Policy.S60
--- a/startupservices/SplashScreen/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/SplashScreen/group/Distribution.Policy.S60
--- a/startupservices/SplashScreen/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/SplashScreen/group/splashscreen.mmp
--- a/startupservices/SplashScreen/group/splashscreen.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/startupservices/SplashScreen/group/splashscreen.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -20,7 +20,7 @@
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
 
-TARGET          SPLASHSCREEN.EXE
+TARGET          splashscreen.exe
 TARGETTYPE      EXE
 TARGETPATH      PROGRAMS_DIR
 UID             0x100039CE 0x100059DE
@@ -45,5 +45,7 @@
 LIBRARY         euser.lib 
 LIBRARY         ws32.lib
 LIBRARY         efsrv.lib
-LIBRARY         AknIcon.lib   // AknIconUtils
+LIBRARY         aknicon.lib   // AknIconUtils
 LIBRARY         fbscli.lib 
+
+SMPSAFE
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/SplashScreen/inc/Distribution.Policy.S60
--- a/startupservices/SplashScreen/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/SplashScreen/rom/Distribution.Policy.S60
--- a/startupservices/SplashScreen/rom/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/SplashScreen/src/Distribution.Policy.S60
--- a/startupservices/SplashScreen/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/Distribution.Policy.S60
--- a/startupservices/Startup/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/MediatorPlugin/Distribution.Policy.S60
--- a/startupservices/Startup/MediatorPlugin/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/MediatorPlugin/group/Distribution.Policy.S60
--- a/startupservices/Startup/MediatorPlugin/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/MediatorPlugin/group/StartupMediatorPlugin.mmp
--- a/startupservices/Startup/MediatorPlugin/group/StartupMediatorPlugin.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/startupservices/Startup/MediatorPlugin/group/StartupMediatorPlugin.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -20,14 +20,14 @@
 
 
 // Build target
-TARGET          StartupMediatorPlugin.dll
+TARGET          startupmediatorplugin.dll
 CAPABILITY      CAP_ECOM_PLUGIN
 TARGETTYPE      PLUGIN
 UID             0x10009D8D 0x102750AF
 VENDORID        VID_DEFAULT
 
 START RESOURCE  ../src/102750AF.rss
-TARGET          StartupMediatorPlugin.rsc
+TARGET          startupmediatorplugin.rsc
 TARGETPATH      resource/plugins
 END
 
@@ -45,13 +45,16 @@
 
 
 LIBRARY         euser.lib               // Core
-LIBRARY         ECom.lib                // ECom
-LIBRARY         MediatorClient.lib      // Mediator client
-LIBRARY         MediatorPluginBase.lib  // Mediator client
+LIBRARY         ecom.lib                // ECom
+LIBRARY         mediatorclient.lib      // Mediator client
+LIBRARY         mediatorpluginbase.lib  // Mediator client
 LIBRARY         featmgr.lib             // FeatureManager
 LIBRARY         centralrepository.lib   // Central Repository
 
 // Logger
 DEBUGLIBRARY    flogger.lib
 
+
+SMPSAFE
 // End of File
+
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/MediatorPlugin/inc/Distribution.Policy.S60
--- a/startupservices/Startup/MediatorPlugin/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/MediatorPlugin/src/Distribution.Policy.S60
--- a/startupservices/Startup/MediatorPlugin/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/aif/Distribution.Policy.S60
--- a/startupservices/Startup/aif/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/bmarm/Distribution.Policy.S60
--- a/startupservices/Startup/bmarm/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/bwins/Distribution.Policy.S60
--- a/startupservices/Startup/bwins/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/cenrep/Distribution.Policy.S60
--- a/startupservices/Startup/cenrep/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/conf/Distribution.Policy.S60
--- a/startupservices/Startup/conf/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/conf/startup.confml
Binary file startupservices/Startup/conf/startup.confml has changed
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/data/Distribution.Policy.S60
--- a/startupservices/Startup/data/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/group/Distribution.Policy.S60
--- a/startupservices/Startup/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/group/bld.inf
--- a/startupservices/Startup/group/bld.inf	Tue Feb 02 10:12:00 2010 +0200
+++ b/startupservices/Startup/group/bld.inf	Fri Apr 16 15:08:06 2010 +0300
@@ -36,9 +36,9 @@
 
  ../loc/startup.loc                         MW_LAYER_LOC_EXPORT_PATH(startup.loc)
 
- ../data/backup_registration.xml            /epoc32/data/z/private/100058F4/backup_registration.xml
- ../data/backup_registration.xml            /epoc32/release/winscw/udeb/z/private/100058F4/backup_registration.xml
- ../data/backup_registration.xml            /epoc32/release/winscw/urel/z/private/100058F4/backup_registration.xml
+ ../data/backup_registration.xml            /epoc32/data/z/private/100058f4/backup_registration.xml
+ ../data/backup_registration.xml            /epoc32/release/winscw/udeb/z/private/100058f4/backup_registration.xml
+ ../data/backup_registration.xml            /epoc32/release/winscw/urel/z/private/100058f4/backup_registration.xml
 
 PRJ_EXTENSIONS
 START EXTENSION s60/mifconv
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/group/startup.mmp
--- a/startupservices/Startup/group/startup.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/startupservices/Startup/group/startup.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -91,12 +91,12 @@
 LIBRARY         ws32.lib
 LIBRARY         aknnotify.lib           //AknGlobalNote
 LIBRARY         apgrfx.lib              //
-LIBRARY         Egul.lib                //DrawUtils
+LIBRARY         egul.lib                //DrawUtils
 LIBRARY         featmgr.lib
 LIBRARY         bafl.lib
 LIBRARY         timezonelocalization.lib
 LIBRARY	        tzclient.lib
-LIBRARY         AknIcon.lib
+LIBRARY         aknicon.lib
 LIBRARY         mediatorclient.lib
 #ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
 LIBRARY         sanimctrl.lib
@@ -109,3 +109,5 @@
 LIBRARY	        gfxtrans.lib
 #endif
 LIBRARY         aknskins.lib
+
+SMPSAFE
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/inc/Distribution.Policy.S60
--- a/startupservices/Startup/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/loc/Distribution.Policy.S60
--- a/startupservices/Startup/loc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/pubsub/Distribution.Policy.S60
--- a/startupservices/Startup/pubsub/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/pubsub/StartupAppInternalPSKeys.h
--- a/startupservices/Startup/pubsub/StartupAppInternalPSKeys.h	Tue Feb 02 10:12:00 2010 +0200
+++ b/startupservices/Startup/pubsub/StartupAppInternalPSKeys.h	Fri Apr 16 15:08:06 2010 +0300
@@ -20,7 +20,7 @@
 #define STARTUPAPPINTERNALPSKEYS_H
 
 // INCLUDES
-#include <StartupDomainPSKeys.h>
+#include <startupdomainpskeys.h>
 
 // =============================================================================
 // Touch Screen Calibration API
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/rom/Distribution.Policy.S60
--- a/startupservices/Startup/rom/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/src/Distribution.Policy.S60
--- a/startupservices/Startup/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/src/StartupAppUi.cpp
--- a/startupservices/Startup/src/StartupAppUi.cpp	Tue Feb 02 10:12:00 2010 +0200
+++ b/startupservices/Startup/src/StartupAppUi.cpp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002-2008 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2002-2010 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"
@@ -17,11 +17,11 @@
 
 
 // SYSTEM INCLUDES
-#include <StringLoader.h>
-#include <AknGlobalNote.h>          //used for Selftest failed note
-#include <aknPopup.h>
+#include <stringloader.h>
+#include <aknglobalnote.h>          //used for Selftest failed note
+#include <aknpopup.h>
 #include <aknlists.h>
-#include <aknSDData.h>
+#include <aknsddata.h>
 #include <badesca.h>
 #include <tzlocalizationdatatypes.h>
 #include <tzlocalizer.h>
@@ -33,7 +33,7 @@
 #include "startupappprivatepskeys.h"
 #include <startupdomainpskeys.h>
 #include <startupdomaincrkeys.h>
-#include <CoreApplicationUIsSDKCRKeys.h>
+#include <coreapplicationuissdkcrkeys.h>
 #include <starterclient.h>
 
 #ifdef RD_UI_TRANSITION_EFFECTS_PHASE2
@@ -864,7 +864,17 @@
             MarkFirstBoot();
             }
         }
-
+	else
+		{
+		// Temporary fix for the defect VEZI-7YDEAR , as clock is not yet supported.
+		TRACES("CStartupAppUi::DoStartupFirstBootAndRTCCheckL(): if PredictiveTimeEnabled is set");
+		if( iFirstBoot && !HiddenReset() )
+		    {
+            TRACES("CStartupAppUi::DoStartupFirstBootAndRTCCheckL(): Mark first boot");
+            MarkFirstBoot();
+			}
+		// End of temporary fix.
+		}
     TRACES("CStartupAppUi::DoStartupFirstBootAndRTCCheckL(): Setting KPSStartupAppState = EStartupAppStateFinished");
     TInt err = RProperty::Set( KPSUidStartupApp, KPSStartupAppState, EStartupAppStateFinished );
     if( KErrNone != err )
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/src/StartupTone.cpp
--- a/startupservices/Startup/src/StartupTone.cpp	Tue Feb 02 10:12:00 2010 +0200
+++ b/startupservices/Startup/src/StartupTone.cpp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005-2007 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2005-2010 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"
@@ -28,7 +28,7 @@
 #include "AudioPreference.h"
 
 #define MIN_VOLUME 0
-#define MAX_VOLUME 10
+#define MAX_VOLUME 10000
 
 //=============================== MEMBER FUNCTIONS ============================
 // ---------------------------------------------------------
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/syserrcmd/bwins/distribution.policy.s60
--- a/startupservices/Startup/syserrcmd/bwins/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/syserrcmd/distribution.policy.s60
--- a/startupservices/Startup/syserrcmd/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/syserrcmd/eabi/distribution.policy.s60
--- a/startupservices/Startup/syserrcmd/eabi/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/syserrcmd/group/distribution.policy.s60
--- a/startupservices/Startup/syserrcmd/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/syserrcmd/group/syserrcmd.mmp
--- a/startupservices/Startup/syserrcmd/group/syserrcmd.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/startupservices/Startup/syserrcmd/group/syserrcmd.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -49,3 +49,5 @@
 // MACRO        __SSM_TRACE_INTO_FILE__
 // LIBRARY      flogger.lib
 // <<< uncomment to direct trace output to file
+
+SMPSAFE
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/syserrcmd/inc/distribution.policy.s60
--- a/startupservices/Startup/syserrcmd/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/syserrcmd/src/distribution.policy.s60
--- a/startupservices/Startup/syserrcmd/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/syserrcmd/tsrc/distribution.policy.s60
--- a/startupservices/Startup/syserrcmd/tsrc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/syserrcmd/tsrc/group/distribution.policy.s60
--- a/startupservices/Startup/syserrcmd/tsrc/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/syserrcmd/tsrc/inc/distribution.policy.s60
--- a/startupservices/Startup/syserrcmd/tsrc/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/bwins/distribution.policy.s60
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/bwins/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/conf/distribution.policy.s60
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/conf/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/data/distribution.policy.s60
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/data/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/distribution.policy.s60
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/eabi/distribution.policy.s60
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/eabi/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/group/distribution.policy.s60
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/group/syserrcmdtest.mmp
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/group/syserrcmdtest.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/group/syserrcmdtest.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -47,3 +47,5 @@
 LIBRARY eikcore.lib
 //LIBRARY     component_under_test.lib
 
+
+SMPSAFE
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/inc/distribution.policy.s60
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/init/distribution.policy.s60
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/init/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/src/distribution.policy.s60
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/bwins/distribution.policy.s60
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/bwins/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/data/distribution.policy.s60
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/data/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/distribution.policy.s60
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/eabi/distribution.policy.s60
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/eabi/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/group/distribution.policy.s60
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/group/syserrcmdtestsstub.mmp
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/group/syserrcmdtestsstub.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/group/syserrcmdtestsstub.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -39,3 +39,5 @@
 
 
 
+
+SMPSAFE
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/inc/distribution.policy.s60
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/src/distribution.policy.s60
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/group/Distribution.Policy.S60
--- a/startupservices/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/inc/Distribution.Policy.S60
--- a/startupservices/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/startupanimation/Distribution.Policy.S60
--- a/startupservices/startupanimation/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/startupanimation/group/Distribution.Policy.S60
--- a/startupservices/startupanimation/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/startupanimation/rom/Distribution.Policy.S60
--- a/startupservices/startupanimation/rom/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/startupanimation/sanimctrl/Distribution.Policy.S60
--- a/startupservices/startupanimation/sanimctrl/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/startupanimation/sanimctrl/bwins/Distribution.Policy.S60
--- a/startupservices/startupanimation/sanimctrl/bwins/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/startupanimation/sanimctrl/eabi/Distribution.Policy.S60
--- a/startupservices/startupanimation/sanimctrl/eabi/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/startupanimation/sanimctrl/group/Distribution.Policy.S60
--- a/startupservices/startupanimation/sanimctrl/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/startupanimation/sanimctrl/group/sanimctrl.mmp
--- a/startupservices/startupanimation/sanimctrl/group/sanimctrl.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/startupservices/startupanimation/sanimctrl/group/sanimctrl.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -46,3 +46,5 @@
 LIBRARY         featmgr.lib
 LIBRARY         mediatorclient.lib
 LIBRARY         sanimengine.lib
+
+SMPSAFE
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/startupanimation/sanimctrl/inc/Distribution.Policy.S60
--- a/startupservices/startupanimation/sanimctrl/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/startupanimation/sanimctrl/src/Distribution.Policy.S60
--- a/startupservices/startupanimation/sanimctrl/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/startupanimation/sanimctrl/src/sanimstartupctrl.cpp
--- a/startupservices/startupanimation/sanimctrl/src/sanimstartupctrl.cpp	Tue Feb 02 10:12:00 2010 +0200
+++ b/startupservices/startupanimation/sanimctrl/src/sanimstartupctrl.cpp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007,2008 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2007-2010 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"
@@ -30,7 +30,7 @@
 #include "trace.h"
 
 const TInt KMinVolume( 0 );  /** Minimum allowed volume level. */
-const TInt KMaxVolume( 10 ); /** Maximum allowed volume level. */
+const TInt KMaxVolume( 10000 ); /** Maximum allowed volume level. */
 
 const TInt KDefaultRepeatCount( 1 ); /** Default repeat count for animation and tone. */
 const TInt KDefaultVolumeRamp( 0 );  /** Default volume ramp value in microseconds. */
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/startupanimation/sanimengine/Distribution.Policy.S60
--- a/startupservices/startupanimation/sanimengine/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/startupanimation/sanimengine/bwins/Distribution.Policy.S60
--- a/startupservices/startupanimation/sanimengine/bwins/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/startupanimation/sanimengine/eabi/Distribution.Policy.S60
--- a/startupservices/startupanimation/sanimengine/eabi/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/startupanimation/sanimengine/group/Distribution.Policy.S60
--- a/startupservices/startupanimation/sanimengine/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/startupanimation/sanimengine/group/sanimengine.mmp
--- a/startupservices/startupanimation/sanimengine/group/sanimengine.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/startupservices/startupanimation/sanimengine/group/sanimengine.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -44,3 +44,5 @@
 LIBRARY         ecom.lib
 LIBRARY         euser.lib
 LIBRARY         fbscli.lib
+
+SMPSAFE
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/startupanimation/sanimengine/inc/Distribution.Policy.S60
--- a/startupservices/startupanimation/sanimengine/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/startupanimation/sanimengine/src/Distribution.Policy.S60
--- a/startupservices/startupanimation/sanimengine/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/startupanimation/sanimihlplugin/Distribution.Policy.S60
--- a/startupservices/startupanimation/sanimihlplugin/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/startupanimation/sanimihlplugin/data/Distribution.Policy.S60
--- a/startupservices/startupanimation/sanimihlplugin/data/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/startupanimation/sanimihlplugin/group/Distribution.Policy.S60
--- a/startupservices/startupanimation/sanimihlplugin/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/startupanimation/sanimihlplugin/group/sanimihlplugin.mmp
--- a/startupservices/startupanimation/sanimihlplugin/group/sanimihlplugin.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/startupservices/startupanimation/sanimihlplugin/group/sanimihlplugin.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -45,3 +45,5 @@
 LIBRARY         euser.lib
 LIBRARY         ihl.lib
 LIBRARY         sanimengine.lib
+
+SMPSAFE
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/startupanimation/sanimihlplugin/inc/Distribution.Policy.S60
--- a/startupservices/startupanimation/sanimihlplugin/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/startupanimation/sanimihlplugin/src/Distribution.Policy.S60
--- a/startupservices/startupanimation/sanimihlplugin/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/startupanimation/sanimmmfplugin/Distribution.Policy.S60
--- a/startupservices/startupanimation/sanimmmfplugin/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/startupanimation/sanimmmfplugin/data/Distribution.Policy.S60
--- a/startupservices/startupanimation/sanimmmfplugin/data/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/startupanimation/sanimmmfplugin/group/Distribution.Policy.S60
--- a/startupservices/startupanimation/sanimmmfplugin/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/startupanimation/sanimmmfplugin/group/sanimmmfplugin.mmp
--- a/startupservices/startupanimation/sanimmmfplugin/group/sanimmmfplugin.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/startupservices/startupanimation/sanimmmfplugin/group/sanimmmfplugin.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -43,3 +43,5 @@
 LIBRARY         euser.lib
 LIBRARY         mediaclientaudio.lib
 LIBRARY         sanimengine.lib
+
+SMPSAFE
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/startupanimation/sanimmmfplugin/inc/Distribution.Policy.S60
--- a/startupservices/startupanimation/sanimmmfplugin/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/startupanimation/sanimmmfplugin/src/Distribution.Policy.S60
--- a/startupservices/startupanimation/sanimmmfplugin/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/startupanimation/sanimsvgplugin/Distribution.Policy.S60
--- a/startupservices/startupanimation/sanimsvgplugin/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/startupanimation/sanimsvgplugin/data/Distribution.Policy.S60
--- a/startupservices/startupanimation/sanimsvgplugin/data/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/startupanimation/sanimsvgplugin/group/Distribution.Policy.S60
--- a/startupservices/startupanimation/sanimsvgplugin/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/startupanimation/sanimsvgplugin/group/sanimsvgplugin.mmp
--- a/startupservices/startupanimation/sanimsvgplugin/group/sanimsvgplugin.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/startupservices/startupanimation/sanimsvgplugin/group/sanimsvgplugin.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -48,3 +48,5 @@
 LIBRARY         gdi.lib
 LIBRARY         sanimengine.lib
 LIBRARY         svgengine.lib
+
+SMPSAFE
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/startupanimation/sanimsvgplugin/inc/Distribution.Policy.S60
--- a/startupservices/startupanimation/sanimsvgplugin/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 startupservices/startupanimation/sanimsvgplugin/src/Distribution.Policy.S60
--- a/startupservices/startupanimation/sanimsvgplugin/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/Distribution.Policy.S60
--- a/sysresmonitoring/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/group/Distribution.Policy.S60
--- a/sysresmonitoring/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/inc/Distribution.Policy.S60
--- a/sysresmonitoring/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oodmonitor/BWINS/distribution.policy.s60
--- a/sysresmonitoring/oodmonitor/BWINS/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oodmonitor/CenRep/distribution.policy.s60
--- a/sysresmonitoring/oodmonitor/CenRep/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oodmonitor/EABI/distribution.policy.s60
--- a/sysresmonitoring/oodmonitor/EABI/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oodmonitor/conf/distribution.policy.s60
--- a/sysresmonitoring/oodmonitor/conf/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oodmonitor/distribution.policy.s60
--- a/sysresmonitoring/oodmonitor/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oodmonitor/group/OODMonitor.mmp
--- a/sysresmonitoring/oodmonitor/group/OODMonitor.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/sysresmonitoring/oodmonitor/group/OODMonitor.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2002-2010 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"
@@ -27,11 +27,12 @@
 VENDORID        VID_DEFAULT
 
 
+SYSTEMINCLUDE		/epoc32/include/mw/hb/hbwidgets
 USERINCLUDE     ../inc
 
 
-APP_LAYER_SYSTEMINCLUDE
-
+//APP_LAYER_SYSTEMINCLUDE
+MW_LAYER_SYSTEMINCLUDE
 
 SOURCEPATH      ../src
 SOURCE          lafshut.cpp
@@ -40,7 +41,7 @@
 LIBRARY         efsrv.lib
 LIBRARY         bafl.lib
 LIBRARY         ws32.lib
-LIBRARY         aknnotify.lib
+LIBRARY		HbWidgets.lib
 
 SOURCEPATH      ../resource
 START RESOURCE  lafmemorywatcher.rss
@@ -49,4 +50,7 @@
 LANGUAGE_IDS
 END
 
+
+SMPSAFE
 // End of file.
+
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oodmonitor/group/distribution.policy.s60
--- a/sysresmonitoring/oodmonitor/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oodmonitor/inc/Ood.h
--- a/sysresmonitoring/oodmonitor/inc/Ood.h	Tue Feb 02 10:12:00 2010 +0200
+++ b/sysresmonitoring/oodmonitor/inc/Ood.h	Fri Apr 16 15:08:06 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2007-2010 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"
@@ -20,7 +20,7 @@
 #define LAFSHUT_H
 
 // SYSTEM INCLUDES
-
+#include "hbdevicemessageboxsymbian.h"
 // USER INCLUDES
 
 // CONSTANTS
@@ -116,7 +116,8 @@
         private:
             TMessageType    iMessageType;
             CMessageInfo*   iMessageInfo[4];
-            CAknGlobalNote* iQuery;
+        
+        
         };
 
     // ======================================================================
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oodmonitor/inc/distribution.policy.s60
--- a/sysresmonitoring/oodmonitor/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oodmonitor/oodmonitor2/BWINS/distribution.policy.s60
--- a/sysresmonitoring/oodmonitor/oodmonitor2/BWINS/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oodmonitor/oodmonitor2/EABI/distribution.policy.s60
--- a/sysresmonitoring/oodmonitor/oodmonitor2/EABI/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oodmonitor/oodmonitor2/distribution.policy.s60
--- a/sysresmonitoring/oodmonitor/oodmonitor2/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oodmonitor/oodmonitor2/group/OODMonitor.mmp
--- a/sysresmonitoring/oodmonitor/oodmonitor2/group/OODMonitor.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/sysresmonitoring/oodmonitor/oodmonitor2/group/OODMonitor.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2002-2010 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"
@@ -26,11 +26,13 @@
 CAPABILITY      CAP_GENERAL_DLL
 VENDORID        VID_DEFAULT
 
+SYSTEMINCLUDE		/epoc32/include/mw/hb/hbwidgets
 USERINCLUDE     ../inc
 USERINCLUDE     ../../inc
 
 
-APP_LAYER_SYSTEMINCLUDE
+
+MW_LAYER_SYSTEMINCLUDE
 
 
 SOURCEPATH      ../src
@@ -45,13 +47,12 @@
 LIBRARY         efsrv.lib
 LIBRARY         bafl.lib
 LIBRARY         ws32.lib
-LIBRARY         aknnotify.lib
-LIBRARY         PlatformEnv.lib
+LIBRARY         platformenv.lib
 LIBRARY         disknotifyhandler.lib
 LIBRARY         commonengine.lib
 LIBRARY         cone.lib
-LIBRARY         avkon.lib
 LIBRARY 	centralrepository.lib
+LIBRARY		HbWidgets.lib
 
 SOURCEPATH      ../../resource
 START RESOURCE  LafMemoryWatcher.rss
@@ -67,4 +68,7 @@
 LANGUAGE_IDS
 END
 
+
+SMPSAFE
 // End of file.
+
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oodmonitor/oodmonitor2/group/distribution.policy.s60
--- a/sysresmonitoring/oodmonitor/oodmonitor2/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oodmonitor/oodmonitor2/inc/distribution.policy.s60
--- a/sysresmonitoring/oodmonitor/oodmonitor2/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oodmonitor/oodmonitor2/inc/outofdiskglobalnote.h
--- a/sysresmonitoring/oodmonitor/oodmonitor2/inc/outofdiskglobalnote.h	Tue Feb 02 10:12:00 2010 +0200
+++ b/sysresmonitoring/oodmonitor/oodmonitor2/inc/outofdiskglobalnote.h	Fri Apr 16 15:08:06 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2007-2010 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"
@@ -22,7 +22,8 @@
 // SYSTEM INCLUDES
 #include <uiklaf/private/lafshut.h>
 #include <coemain.h>
-#include <AknGlobalNote.h>
+#include "hbdevicemessageboxsymbian.h"
+
 
 // USER INCLUDES
 
@@ -64,7 +65,6 @@
     private: // Data
         COutOfDiskMonitor*  iOutOfDiskMonitor; //uses
         RFs&                iFs;
-        CAknGlobalNote*     iQuery;
         RResourceFile       iOODResourceFile;
         TNoteInfo           iNoteInfo;
     };
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oodmonitor/oodmonitor2/resource/distribution.policy.s60
--- a/sysresmonitoring/oodmonitor/oodmonitor2/resource/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oodmonitor/oodmonitor2/src/distribution.policy.s60
--- a/sysresmonitoring/oodmonitor/oodmonitor2/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oodmonitor/oodmonitor2/src/outofdiskglobalnote.cpp
--- a/sysresmonitoring/oodmonitor/oodmonitor2/src/outofdiskglobalnote.cpp	Tue Feb 02 10:12:00 2010 +0200
+++ b/sysresmonitoring/oodmonitor/oodmonitor2/src/outofdiskglobalnote.cpp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2007-2010 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"
@@ -18,16 +18,12 @@
 
 // SYSTEM INCLUDES
 #include <e32property.h>
-#include <AknGlobalNote.h>
-#include <SecondaryDisplay/AknSecondaryDisplayDefs.h>
-#include <aknSDData.h>
-#include <avkon.rsg>
 #include <data_caging_path_literals.hrh>
 #include <driveinfo.h>
 #include <outofdiskmonitor.rsg>
 #include <bautils.h>                // BaflUtils
 #include <StringLoader.h>
-#include <aknnotewrappers.h>
+
 
 // USER INCLUDES
 #include "UiklafInternalCRKeys.h"
@@ -60,7 +56,6 @@
 COutOfDiskGlobalNote::~COutOfDiskGlobalNote()
     {
     TRACES("COutOfDiskGlobalNote::~COutOfDiskGlobalNote");
-    delete iQuery;
     iOODResourceFile.Close();
     Cancel(); // Cancel active object    
     TRACES("COutOfDiskGlobalNote::~COutOfDiskGlobalNote: End");
@@ -110,19 +105,15 @@
 void COutOfDiskGlobalNote::DisplayL(const TDesC& aMessage)
     {
     TRACES("COutOfDiskGlobalNote::DisplayL");
-    if (iNoteInfo.iNoteId > KErrNotFound)
-        {
-        CancelNoteL();
-        }
-    
-    if (!iQuery)
-        {
-        TRACES("COutOfDiskGlobalNote::COutOfDiskGlobalNote::DisplayL: Create iQuery");        
-        iQuery = CAknGlobalNote::NewL();
-        iQuery->SetSoftkeys(R_AVKON_SOFTKEYS_OK_EMPTY);
-        }
-    iNoteInfo.iNoteId = iQuery->ShowNoteL(iStatus, EAknGlobalWarningNote, aMessage);
-    SetActive();
+       
+     TRACES("COutOfDiskGlobalNote::COutOfDiskGlobalNote::DisplayL: Create iQuery");        
+     CHbDeviceMessageBoxSymbian* globalNote = CHbDeviceMessageBoxSymbian::NewL(CHbDeviceMessageBoxSymbian::EWarning);
+     CleanupStack::PushL(globalNote);
+     globalNote->SetTextL(aMessage);
+     globalNote->SetTimeoutL(0);
+     globalNote->ExecL();
+     CleanupStack::PopAndDestroy(globalNote);
+     
     TRACES("COutOfDiskGlobalNote::DisplayL: End");
     }
 
@@ -143,8 +134,7 @@
 
     if (iOutOfDiskMonitor->GetGlobalNotesAllowed())
         {
-        TInt sdDialogId = 0;
-
+    
         TResourceReader resReader;
         HBufC8* str(NULL);
         CDesCArray* strings = new ( ELeave ) CDesCArrayFlat( 2 );
@@ -169,7 +159,6 @@
             
             if (aDrive == iOutOfDiskMonitor->GetDefaultPhoneMemory())
                 {
-                sdDialogId = EAknDiskWarnignNote;
                 str = iOODResourceFile.AllocReadLC(R_QTN_MEMLO_DEVICE_MEMORY_LOW);
                 resReader.SetBuffer(str);    
                 strings->AppendL( driveName );
@@ -177,7 +166,6 @@
             else if (driveStatus & DriveInfo::EDriveRemovable)
                 {
                 TRACES1("COutOfDiskGlobalNote::ShowGlobalQueryL: Warning note! volNameLength: %d", nameLength);
-                sdDialogId = EAknMMCWarningNote;
                 TBufC<KMaxFileName> name(volInfo.iName);
                 if (nameLength)
                     {
@@ -196,7 +184,6 @@
                 }
             else
                 {
-                sdDialogId = EAknDiskWarnignNote;
                 str = iOODResourceFile.AllocReadLC(R_QTN_MEMLO_MASS_STORAGE_MEMORY_LOW);
                 resReader.SetBuffer(str);    
                 strings->AppendL( driveName );                
@@ -207,14 +194,12 @@
             TRACES1("COutOfDiskGlobalNote::ShowGlobalQueryL: Critical note! Drive: %c", aDrive+'A');
             if (aDrive == iOutOfDiskMonitor->GetDefaultPhoneMemory())
                 {
-                sdDialogId = EAknDiskFullNote;
                 str = iOODResourceFile.AllocReadLC(R_QTN_MEMLO_DEVICE_MEMORY_FULL);
                 resReader.SetBuffer(str);    
                 strings->AppendL( driveName );                
                 }                
             else if (driveStatus & DriveInfo::EDriveRemovable)
                 {
-                sdDialogId = EAknMMCFullNote;
                 TBufC<KMaxFileName> name(volInfo.iName);
                 if (nameLength)
                     {
@@ -233,27 +218,25 @@
                 }
             else
                 {
-                sdDialogId = EAknDiskFullNote;
                 str = iOODResourceFile.AllocReadLC(R_QTN_MEMLO_MASS_STORAGE_FULL);
                 resReader.SetBuffer(str);
                 strings->AppendL( driveName );                
                 }
             }
         resReader.SetBuffer(str);
-	    HBufC* message( FormatStringL(resReader.ReadHBufCL()->Des(), *strings));
-	    TRACES1("COutOfDiskMonitor::ShowGlobalQueryL: txt: %S",message);
+	      HBufC* resHandle = resReader.ReadHBufCL();
+        CleanupStack::PushL( resHandle );
+        HBufC* message(FormatStringL(resHandle->Des(),*strings));
+        CleanupStack::PushL( message );
+	      TRACES1("COutOfDiskMonitor::ShowGlobalQueryL: txt: %S",message);
         DisplayL(message->Des());
 
-		TBuf8<2> sdDriveName;
-		sdDriveName.Append(aDrive+'A');
-		sdDriveName.Append(_L8(":"));	
-        CAknSDData* sd = CAknSDData::NewL(KAknSecondaryDisplayCategory, sdDialogId, sdDriveName);
-        iQuery->SetSecondaryDisplayData(sd);     
-
         iNoteInfo.iStatus = aStatus;
         iNoteInfo.iDrive = aDrive;        
+        CleanupStack::PopAndDestroy(message);
+        CleanupStack::PopAndDestroy(resHandle);
         CleanupStack::PopAndDestroy( str );
-        CleanupStack::PopAndDestroy( strings );
+        CleanupStack::PopAndDestroy( strings ); 
         iOutOfDiskMonitor->SetAsDisplayedL(aDrive, aStatus);
         }
     TRACES("COutOfDiskGlobalNote::ShowGlobalQueryL: End");
@@ -341,10 +324,6 @@
     {
     TRACES("COutOfDiskGlobalNote::CancelNoteL");
     
-    if (iNoteInfo.iNoteId > KErrNotFound)
-        {    
-        iQuery->CancelNoteL(iNoteInfo.iNoteId);
-        }
     Cancel();
     TRACES("COutOfDiskGlobalNote::CancelNoteL: End");    
     }    
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oodmonitor/resource/distribution.policy.s60
--- a/sysresmonitoring/oodmonitor/resource/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oodmonitor/rom/distribution.policy.s60
--- a/sysresmonitoring/oodmonitor/rom/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oodmonitor/src/distribution.policy.s60
--- a/sysresmonitoring/oodmonitor/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oodmonitor/src/lafshut.cpp
--- a/sysresmonitoring/oodmonitor/src/lafshut.cpp	Tue Feb 02 10:12:00 2010 +0200
+++ b/sysresmonitoring/oodmonitor/src/lafshut.cpp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2006-2010 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"
@@ -24,10 +24,6 @@
 #include <bautils.h>
 #include <e32property.h>
 #include <UikonInternalPSKeys.h>
-#include <aknglobalnote.h>
-#include <secondarydisplay/aknsecondarydisplaydefs.h>
-#include <aknsddata.h>
-#include <avkon.rsg>
 #include <data_caging_path_literals.hrh>
 #include <coreapplicationuisdomainpskeys.h>
 
@@ -726,7 +722,6 @@
 CLafShutdownManager::CGlobalQueryActive::~CGlobalQueryActive()
     {
     TRACES("CLafShutdownManager::CGlobalQueryActive::~CGlobalQueryActive");        
-    delete iQuery;
     delete iMessageInfo[ECritical];
     delete iMessageInfo[EWarning];
     delete iMessageInfo[EWarningMMC];
@@ -801,50 +796,21 @@
         return;
         }
 
-    if (!iQuery)
-        {
-        iQuery = CAknGlobalNote::NewL();
-        iQuery->SetSoftkeys(R_AVKON_SOFTKEYS_OK_EMPTY);        
-        }
-
-    if (aType != ECallBack)
+      if (aType != ECallBack)
         {
         iMessageType = aType;
         }
 
     CleanupL();
 
-    if (iMessageType != ENone && (iMessageInfo[iMessageType]->iNoteId == KErrNotFound || aForcedNote))
-        {
-        TInt dialogId = 0;
-        switch(iMessageType)
-            {
-        case EWarning:
-            dialogId = EAknDiskWarnignNote;
-            break;
-        case ECritical:
-            dialogId = EAknDiskFullNote;
-            break;
-        case ECriticalMMC:    
-            dialogId = EAknMMCFullNote;
-            break;
-        default:
-            dialogId = EAknMMCWarningNote;
-            break;            
-            }
+          
+        CHbDeviceMessageBoxSymbian* globalNote = CHbDeviceMessageBoxSymbian::NewL(CHbDeviceMessageBoxSymbian::EWarning);
+        CleanupStack::PushL(globalNote);
+        globalNote->SetTextL((iMessageInfo[iMessageType]->iMessage)->Des());
+        globalNote->SetTimeoutL(0);
+        globalNote->ExecL();
+        CleanupStack::PopAndDestroy(globalNote);
         
-        CAknSDData* sd = CAknSDData::NewL(KAknSecondaryDisplayCategory, dialogId, KNullDesC8);
-        iQuery->SetSecondaryDisplayData(sd);
-        
-        TInt noteid = iQuery->ShowNoteL(EAknGlobalWarningNote,
-                                        (iMessageInfo[iMessageType]->iMessage)->Des());
-                                        
-        if (noteid != KErrNotFound) // Note was added to queue successfully.
-            {
-            iMessageInfo[iMessageType]->iNoteId = noteid;
-            }
-        }
-
     iMessageType = ENone;
     TRACES("CLafShutdownManager::CGlobalQueryActive::DisplayL: End");
     }
@@ -877,11 +843,7 @@
             break;
             }
 
-        if (cancelNoteId != KErrNotFound && aCancel)
-            {
-            iQuery->CancelNoteL(cancelNoteId);
-            }
-        }
+         }
     TRACES("CLafShutdownManager::CGlobalQueryActive::CleanupL: End");
     }
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oommonitor/bwins/distribution.policy.s60
--- a/sysresmonitoring/oommonitor/bwins/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oommonitor/distribution.policy.s60
--- a/sysresmonitoring/oommonitor/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oommonitor/eabi/distribution.policy.s60
--- a/sysresmonitoring/oommonitor/eabi/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oommonitor/group/distribution.policy.s60
--- a/sysresmonitoring/oommonitor/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oommonitor/group/oommonitor.mmp
--- a/sysresmonitoring/oommonitor/group/oommonitor.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/sysresmonitoring/oommonitor/group/oommonitor.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -46,3 +46,5 @@
 LIBRARY         ecom.lib
 LIBRARY         hal.lib
 LIBRARY         efsrv.lib
+
+SMPSAFE
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oommonitor/inc/distribution.policy.s60
--- a/sysresmonitoring/oommonitor/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oommonitor/rom/distribution.policy.s60
--- a/sysresmonitoring/oommonitor/rom/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oommonitor/src/distribution.policy.s60
--- a/sysresmonitoring/oommonitor/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oommonitor/tsrc/Distribution.Policy.S60
--- a/sysresmonitoring/oommonitor/tsrc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oommonitor/tsrc/public/Distribution.Policy.S60
--- a/sysresmonitoring/oommonitor/tsrc/public/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oommonitor/tsrc/public/adv/Distribution.Policy.S60
--- a/sysresmonitoring/oommonitor/tsrc/public/adv/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oommonitor/tsrc/public/adv/conf/Distribution.Policy.S60
--- a/sysresmonitoring/oommonitor/tsrc/public/adv/conf/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oommonitor/tsrc/public/adv/data/Distribution.Policy.S60
--- a/sysresmonitoring/oommonitor/tsrc/public/adv/data/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oommonitor/tsrc/public/adv/group/Distribution.Policy.S60
--- a/sysresmonitoring/oommonitor/tsrc/public/adv/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oommonitor/tsrc/public/adv/init/Distribution.Policy.S60
--- a/sysresmonitoring/oommonitor/tsrc/public/adv/init/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oommonitor/tsrc/public/basic/BWINS/Distribution.Policy.S60
--- a/sysresmonitoring/oommonitor/tsrc/public/basic/BWINS/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oommonitor/tsrc/public/basic/Distribution.Policy.S60
--- a/sysresmonitoring/oommonitor/tsrc/public/basic/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oommonitor/tsrc/public/basic/EABI/Distribution.Policy.S60
--- a/sysresmonitoring/oommonitor/tsrc/public/basic/EABI/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oommonitor/tsrc/public/basic/MT_OomMonitor/Distribution.Policy.S60
--- a/sysresmonitoring/oommonitor/tsrc/public/basic/MT_OomMonitor/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oommonitor/tsrc/public/basic/conf/Distribution.Policy.S60
--- a/sysresmonitoring/oommonitor/tsrc/public/basic/conf/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oommonitor/tsrc/public/basic/data/Distribution.Policy.S60
--- a/sysresmonitoring/oommonitor/tsrc/public/basic/data/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oommonitor/tsrc/public/basic/group/Distribution.Policy.S60
--- a/sysresmonitoring/oommonitor/tsrc/public/basic/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oommonitor/tsrc/public/basic/group/MT_OomMonitor.mmp
--- a/sysresmonitoring/oommonitor/tsrc/public/basic/group/MT_OomMonitor.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/sysresmonitoring/oommonitor/tsrc/public/basic/group/MT_OomMonitor.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -50,4 +50,7 @@
 LIBRARY        			ws32.lib
 LIBRARY         		apgrfx.lib	// TApaTask
 
+
+SMPSAFE
 // End of file
+
diff -r 2e3d3ce01487 -r c4cbaa4fb734 sysresmonitoring/oommonitor/tsrc/public/basic/init/Distribution.Policy.S60
--- a/sysresmonitoring/oommonitor/tsrc/public/basic/init/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 systemsettings/Distribution.Policy.S60
--- a/systemsettings/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 systemsettings/GSAccessoryPlugin/Distribution.Policy.S60
--- a/systemsettings/GSAccessoryPlugin/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 systemsettings/GSAccessoryPlugin/cenrep/Distribution.Policy.S60
--- a/systemsettings/GSAccessoryPlugin/cenrep/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 systemsettings/GSAccessoryPlugin/conf/distribution.policy.s60
--- a/systemsettings/GSAccessoryPlugin/conf/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 systemsettings/GSAccessoryPlugin/data/Distribution.Policy.S60
--- a/systemsettings/GSAccessoryPlugin/data/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 systemsettings/GSAccessoryPlugin/data/gsaccessoryplugin.rss
--- a/systemsettings/GSAccessoryPlugin/data/gsaccessoryplugin.rss	Tue Feb 02 10:12:00 2010 +0200
+++ b/systemsettings/GSAccessoryPlugin/data/gsaccessoryplugin.rss	Fri Apr 16 15:08:06 2010 +0300
@@ -68,11 +68,10 @@
             {
             menu_pane = r_gs_menu_item_help;
             },
-    //fix for single click and removing "set as default" from option in menu
-    /*    MENU_TITLE 
+        MENU_TITLE
             {
             menu_pane = r_acc_menu_item_set_as_default;
-            },*/
+            },
         MENU_TITLE
             {
             menu_pane = r_gs_menu_item_open;
@@ -84,8 +83,7 @@
 // R_ACC_MENU_ITEM_SET_AS_DEFAULT
 //----------------------------------------------------------------------------
 //
-//fix for single click and removing "set as default" from option in menu
-/* RESOURCE MENU_PANE r_acc_menu_item_set_as_default  
+RESOURCE MENU_PANE r_acc_menu_item_set_as_default
     {
     items =
         {
@@ -96,7 +94,7 @@
 	    flags = EEikMenuItemSpecific;
             }
         };
-    } */
+    }
 
 //----------------------------------------------------------------------------
 // R_ACC_MAIN_VIEW_CAPTION
diff -r 2e3d3ce01487 -r c4cbaa4fb734 systemsettings/GSAccessoryPlugin/group/GSAccessoryPlugin.mmp
--- a/systemsettings/GSAccessoryPlugin/group/GSAccessoryPlugin.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/systemsettings/GSAccessoryPlugin/group/GSAccessoryPlugin.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -104,3 +104,5 @@
 #endif //__WINS
 LIBRARY   hlplch.lib            // "Help" options menu
 LIBRARY   profileeng.lib        // Profile Engine
+
+SMPSAFE
diff -r 2e3d3ce01487 -r c4cbaa4fb734 systemsettings/GSAccessoryPlugin/group/distribution.policy.s60
--- a/systemsettings/GSAccessoryPlugin/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 systemsettings/GSAccessoryPlugin/inc/Distribution.Policy.S60
--- a/systemsettings/GSAccessoryPlugin/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 systemsettings/GSAccessoryPlugin/loc/Distribution.Policy.S60
--- a/systemsettings/GSAccessoryPlugin/loc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 systemsettings/GSAccessoryPlugin/rom/distribution.policy.s60
--- a/systemsettings/GSAccessoryPlugin/rom/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 systemsettings/GSAccessoryPlugin/src/Distribution.Policy.S60
--- a/systemsettings/GSAccessoryPlugin/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 systemsettings/group/Distribution.Policy.S60
--- a/systemsettings/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 systemsettings/gssensorplugin/Distribution.Policy.S60
--- a/systemsettings/gssensorplugin/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 systemsettings/gssensorplugin/cenrep/Distribution.Policy.S60
--- a/systemsettings/gssensorplugin/cenrep/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 systemsettings/gssensorplugin/conf/Distribution.Policy.S60
--- a/systemsettings/gssensorplugin/conf/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 systemsettings/gssensorplugin/data/Distribution.Policy.S60
--- a/systemsettings/gssensorplugin/data/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 systemsettings/gssensorplugin/group/Distribution.Policy.S60
--- a/systemsettings/gssensorplugin/group/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 systemsettings/gssensorplugin/group/gssensorplugin.cfg
--- a/systemsettings/gssensorplugin/group/gssensorplugin.cfg	Tue Feb 02 10:12:00 2010 +0200
+++ b/systemsettings/gssensorplugin/group/gssensorplugin.cfg	Fri Apr 16 15:08:06 2010 +0300
@@ -15,7 +15,6 @@
 *
 */
 
-
 #ifndef GSSENSORPLUGIN_CFG
 #define GSSENSORPLUGIN_CFG
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 systemsettings/gssensorplugin/group/gssensorplugin.mmp
--- a/systemsettings/gssensorplugin/group/gssensorplugin.mmp	Tue Feb 02 10:12:00 2010 +0200
+++ b/systemsettings/gssensorplugin/group/gssensorplugin.mmp	Fri Apr 16 15:08:06 2010 +0300
@@ -74,11 +74,13 @@
 LIBRARY   egul.lib              // For GulIcon in checkbox icons
 LIBRARY   eikctl.lib            // For checkbox icons
 
-LIBRARY   CommonEngine.lib      // For RConeResourceLoader
-LIBRARY   FeatMgr.lib           // Feature manager 
-LIBRARY   CentralRepository.lib // for CenRep
+LIBRARY   commonengine.lib      // For RConeResourceLoader
+LIBRARY   featmgr.lib           // Feature manager 
+LIBRARY   centralrepository.lib // for CenRep
 LIBRARY   aknskins.lib          // for enhanced skinning
 LIBRARY   hlplch.lib            // for "Help" options menu
-LIBRARY   GSFramework.lib       // For base classes
-LIBRARY   GSListBox.lib         // For CGSListBoxItemTextArray
-LIBRARY   GSEcomPlugin.lib      // For base classes
+LIBRARY   gsframework.lib       // For base classes
+LIBRARY   gslistbox.lib         // For CGSListBoxItemTextArray
+LIBRARY   gsecomplugin.lib      // For base classes
+
+SMPSAFE
diff -r 2e3d3ce01487 -r c4cbaa4fb734 systemsettings/gssensorplugin/inc/Distribution.Policy.S60
--- a/systemsettings/gssensorplugin/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 systemsettings/gssensorplugin/loc/Distribution.Policy.S60
--- a/systemsettings/gssensorplugin/loc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 systemsettings/gssensorplugin/rom/Distribution.Policy.S60
--- a/systemsettings/gssensorplugin/rom/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 systemsettings/gssensorplugin/src/Distribution.Policy.S60
--- a/systemsettings/gssensorplugin/src/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 systemsettings/inc/Distribution.Policy.S60
--- a/systemsettings/inc/Distribution.Policy.S60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzpcside/tzcompiler/Include/distribution.policy.s60
--- a/tzpcside/tzcompiler/Include/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzpcside/tzcompiler/Release/Data/distribution.policy.s60
--- a/tzpcside/tzcompiler/Release/Data/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzpcside/tzcompiler/Release/distribution.policy.s60
--- a/tzpcside/tzcompiler/Release/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzpcside/tzcompiler/Source/distribution.policy.s60
--- a/tzpcside/tzcompiler/Source/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzpcside/tzcompiler/documentation/SGL.GT0197.232 App-Services Tz  9.1 How-To Create the Tz Database.doc
Binary file tzpcside/tzcompiler/documentation/SGL.GT0197.232 App-Services Tz  9.1 How-To Create the Tz Database.doc has changed
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzpcside/tzcompiler/documentation/distribution.policy.s60
--- a/tzpcside/tzcompiler/documentation/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzpcside/tzcompiler/group/app-services_tzcompiler.mrp
--- a/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp	Tue Feb 02 10:12:00 2010 +0200
+++ b/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,3 +1,19 @@
+#
+# 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: 
+#
+
 component	app-services_tzcompiler
 source	\sf\mw\appsupport\tzpcside\tzcompiler
 binary	\sf\mw\appsupport\tzpcside\tzcompiler\group	all
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzpcside/tzcompiler/group/distribution.policy.s60
--- a/tzpcside/tzcompiler/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzpcside/tzcompiler/test/integration/TzCompilerTests/documentation/TestTzCompiler Description Document.doc
Binary file tzpcside/tzcompiler/test/integration/TzCompilerTests/documentation/TestTzCompiler Description Document.doc has changed
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzpcside/tzcompiler/test/integration/TzCompilerTests/documentation/distribution.policy.s60
--- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/documentation/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzpcside/tzcompiler/test/integration/TzCompilerTests/group/distribution.policy.s60
--- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzpcside/tzcompiler/test/integration/TzCompilerTests/inc/distribution.policy.s60
--- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzpcside/tzcompiler/test/integration/TzCompilerTests/src/distribution.policy.s60
--- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test1/distribution.policy.s60
--- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test1/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test10/distribution.policy.s60
--- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test10/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test11/distribution.policy.s60
--- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test11/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test12/distribution.policy.s60
--- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test12/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test13/distribution.policy.s60
--- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test13/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test2/distribution.policy.s60
--- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test2/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test3/distribution.policy.s60
--- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test3/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test4/distribution.policy.s60
--- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test4/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test5/distribution.policy.s60
--- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test5/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test6/distribution.policy.s60
--- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test6/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test7/distribution.policy.s60
--- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test7/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test8/distribution.policy.s60
--- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test8/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test9/distribution.policy.s60
--- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test9/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzdatabase/data/distribution.policy.s60
--- a/tzservices/tzdatabase/data/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzdatabase/group/app-services_tzdb.mrp
--- a/tzservices/tzdatabase/group/app-services_tzdb.mrp	Tue Feb 02 10:12:00 2010 +0200
+++ b/tzservices/tzdatabase/group/app-services_tzdb.mrp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,3 +1,19 @@
+#
+# 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: 
+#
+
 component	app-services_tzdb
 source	\sf\mw\appsupport\tzservices\tzdatabase
 binary	\sf\mw\appsupport\tzservices\tzdatabase\group	all
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzdatabase/group/distribution.policy.s60
--- a/tzservices/tzdatabase/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzloc/bwins/distribution.policy.s60
--- a/tzservices/tzloc/bwins/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzloc/documentation/SGL.GT0284.216 - Time Zone Services CR1606 How-To.doc
Binary file tzservices/tzloc/documentation/SGL.GT0284.216 - Time Zone Services CR1606 How-To.doc has changed
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzloc/documentation/distribution.policy.s60
--- a/tzservices/tzloc/documentation/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzloc/eabi/distribution.policy.s60
--- a/tzservices/tzloc/eabi/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzloc/group/app-services_timezonelocalization.mrp
--- a/tzservices/tzloc/group/app-services_timezonelocalization.mrp	Tue Feb 02 10:12:00 2010 +0200
+++ b/tzservices/tzloc/group/app-services_timezonelocalization.mrp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,3 +1,19 @@
+#
+# 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: 
+#
+
 component	app-services_TimeZoneLocalization
 source	\sf\mw\appsupport\tzservices\tzloc
 binary	\sf\mw\appsupport\tzservices\tzloc\group	all
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzloc/group/backup_registration.xml
--- a/tzservices/tzloc/group/backup_registration.xml	Tue Feb 02 10:12:00 2010 +0200
+++ b/tzservices/tzloc/group/backup_registration.xml	Fri Apr 16 15:08:06 2010 +0300
@@ -1,10 +1,10 @@
 <?xml version="1.0" standalone="yes"?>
 
 <!--
- Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+ Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
  All rights reserved.
  This component and the accompanying materials are made available
- under the terms of the License "Eclipse Public License v1.0"
+ 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".
 
@@ -21,4 +21,4 @@
 
 <backup_registration>
    <dbms_backup policy="10206A8B"/>
-</backup_registration>
\ No newline at end of file
+</backup_registration>
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzloc/group/distribution.policy.s60
--- a/tzservices/tzloc/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzloc/inc/distribution.policy.s60
--- a/tzservices/tzloc/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzloc/res/distribution.policy.s60
--- a/tzservices/tzloc/res/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzloc/src/distribution.policy.s60
--- a/tzservices/tzloc/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzloc/test/integration/TzLocalTestServer/bwins/distribution.policy.s60
--- a/tzservices/tzloc/test/integration/TzLocalTestServer/bwins/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzloc/test/integration/TzLocalTestServer/group/distribution.policy.s60
--- a/tzservices/tzloc/test/integration/TzLocalTestServer/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzloc/test/integration/TzLocalTestServer/inc/distribution.policy.s60
--- a/tzservices/tzloc/test/integration/TzLocalTestServer/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzloc/test/integration/TzLocalTestServer/src/distribution.policy.s60
--- a/tzservices/tzloc/test/integration/TzLocalTestServer/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzloc/test/integration/data/distribution.policy.s60
--- a/tzservices/tzloc/test/integration/data/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzloc/test/integration/tztestscripts/distribution.policy.s60
--- a/tzservices/tzloc/test/integration/tztestscripts/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzloc/test/integration/tztestscripts/tzlocnoresource_post.bat
--- a/tzservices/tzloc/test/integration/tztestscripts/tzlocnoresource_post.bat	Tue Feb 02 10:12:00 2010 +0200
+++ b/tzservices/tzloc/test/integration/tztestscripts/tzlocnoresource_post.bat	Fri Apr 16 15:08:06 2010 +0300
@@ -1,3 +1,18 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description: 
+@rem
 REM Move the required localization files from temporary directory to original directory
 
 move \epoc32\release\winscw\udeb\z\resource\temp\timezones.r01 \epoc32\release\winscw\udeb\z\resource\timezonelocalization\timezones.r01 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzloc/test/integration/tztestscripts/tzlocnoresource_pre.bat
--- a/tzservices/tzloc/test/integration/tztestscripts/tzlocnoresource_pre.bat	Tue Feb 02 10:12:00 2010 +0200
+++ b/tzservices/tzloc/test/integration/tztestscripts/tzlocnoresource_pre.bat	Fri Apr 16 15:08:06 2010 +0300
@@ -1,3 +1,18 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description: 
+@rem
 REM Create a temporary directory to store the original localization resource files
 
 mkdir \epoc32\release\winscw\udeb\z\resource\temp
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzloc/test/rtest/distribution.policy.s60
--- a/tzservices/tzloc/test/rtest/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzloc/test/rtest/timezonelocalization/distribution.policy.s60
--- a/tzservices/tzloc/test/rtest/timezonelocalization/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzloc/test/rtest/timezonelocalization/locale/distribution.policy.s60
--- a/tzservices/tzloc/test/rtest/timezonelocalization/locale/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzloc/test/rtest/timezonelocalization/modified/distribution.policy.s60
--- a/tzservices/tzloc/test/rtest/timezonelocalization/modified/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzloc/test/tzltestres/distribution.policy.s60
--- a/tzservices/tzloc/test/tzltestres/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzloc/test/unit/Scripts/distribution.policy.s60
--- a/tzservices/tzloc/test/unit/Scripts/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzloc/test/unit/TzLocalizationTestServer/bwins/distribution.policy.s60
--- a/tzservices/tzloc/test/unit/TzLocalizationTestServer/bwins/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzloc/test/unit/TzLocalizationTestServer/group/distribution.policy.s60
--- a/tzservices/tzloc/test/unit/TzLocalizationTestServer/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzloc/test/unit/TzLocalizationTestServer/inc/distribution.policy.s60
--- a/tzservices/tzloc/test/unit/TzLocalizationTestServer/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzloc/test/unit/TzLocalizationTestServer/src/distribution.policy.s60
--- a/tzservices/tzloc/test/unit/TzLocalizationTestServer/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzloc/test/unit/data/distribution.policy.s60
--- a/tzservices/tzloc/test/unit/data/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp
--- a/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp	Tue Feb 02 10:12:00 2010 +0200
+++ b/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,3 +1,19 @@
+#
+# 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: 
+#
+
 component	app-services_tzlocalizationrscfactory
 source	\sf\mw\appsupport\tzservices\tzlocrscfactory
 binary	\sf\mw\appsupport\tzservices\tzlocrscfactory\group	all
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzlocrscfactory/group/distribution.policy.s60
--- a/tzservices/tzlocrscfactory/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzlocrscfactory/res/distribution.policy.s60
--- a/tzservices/tzlocrscfactory/res/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/Client/Include/distribution.policy.s60
--- a/tzservices/tzserver/Client/Include/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/Client/Source/distribution.policy.s60
--- a/tzservices/tzserver/Client/Source/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/Include/distribution.policy.s60
--- a/tzservices/tzserver/Include/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/Server/Include/distribution.policy.s60
--- a/tzservices/tzserver/Server/Include/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/Server/Source/distribution.policy.s60
--- a/tzservices/tzserver/Server/Source/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/analysis/DAYLIGHT SAVINGS ANALYSIS.mdl
--- a/tzservices/tzserver/analysis/DAYLIGHT SAVINGS ANALYSIS.mdl	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6210 +0,0 @@
-
-(object Petal
-    version    	43
-    _written   	"Rose 6.5.9232.10"
-    charSet    	0)
-
-(object Design "Logical View"
-    is_unit    	TRUE
-    is_loaded  	TRUE
-    quid       	"36D487460258"
-    defaults   	(object defaults
-	rightMargin 	0.250000
-	leftMargin 	0.250000
-	topMargin  	0.250000
-	bottomMargin 	0.500000
-	pageOverlap 	0.250000
-	clipIconLabels 	TRUE
-	autoResize 	TRUE
-	snapToGrid 	FALSE
-	gridX      	16
-	gridY      	16
-	defaultFont 	(object Font
-	    size       	9
-	    face       	"Arial"
-	    bold       	FALSE
-	    italics    	FALSE
-	    underline  	FALSE
-	    strike     	FALSE
-	    color      	0
-	    default_color 	TRUE)
-	showMessageNum 	1
-	showClassOfObject 	TRUE
-	notation   	"Unified")
-    root_usecase_package 	(object Class_Category "Use Case View"
-	quid       	"34DBB4830142"
-	documentation 	
-|The Use Case View organizes the Use-Case Model and the optional Business Use-Case Model.
-|
-	
-	exportControl 	"Public"
-	global     	TRUE
-	logical_models 	(list unit_reference_list
-	    (object Class_Category "Business Use-Case Model"
-		quid       	"35B677D701B8"
-		documentation 	
-|Optional Model:
-|The business modeling workflow in Rational Unified Process produces two models: the business use-case model, and the business object model. Both show the business 
-|processes, but different aspects of them. In the business use-case model each business use case represents a business process, described (text and/or activity diagrams) from an "external" view point without worrying about who does what to whom inside of the organization. 
-|In the business object model, you include realizations of each business use case to show how workers and entities collaborate to perform the process. You do that using class diagrams, activity diagrams with swimlanes, collaboration diagrams, and/or interaction diagrams.
-|
-|<Any additional description of the Business Use Case Model, such as modeling conventions that the reader/reviewer may need to understand the model, should be described here.>
-		
-		exportControl 	"Public"
-		logical_models 	(list unit_reference_list)
-		logical_presentations 	(list unit_reference_list
-		    (object UseCaseDiagram "Global View of Business Actors and Business Use Cases"
-			quid       	"35C0DFF50172"
-			title      	"Global View of Business Actors and Business Use Cases"
-			documentation 	"This is a global view of the system showing all Busines Use Cases and Business Actors.  It is intended to be an overview diagram, so if the diagram becomes too complex for easy comprehension, use several diagrams, each of which should focus on a different aspect of the system.  Usually, organizing use case diagrams around actors is a good approach."
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object NoteView @1
-				location   	(464, 352)
-				label      	(object ItemLabel
-				    Parent_View 	@1
-				    location   	(42, 11)
-				    fill_color 	13434879
-				    nlines     	14
-				    max_width  	809
-				    label      	
-|Global View of Business Actors and BusinessUse Cases
-|
-|This diagram presents all Business Actors and all concrete Business Use Cases (those that are directly instantiable).
-|
-|Related Rational Unified Process Activities:
-|- Activity: Find Business Actors and Use Cases
-|- Activity: Structure the Business Use Case Model
-|
-|*Note: this note may be deleted once the diagram is created.
-				    )
-				line_color 	3342489
-				fill_color 	13434879
-				width      	869
-				height     	694)
-			    (object NoteView @2
-				location   	(1280, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@2
-				    location   	(942, 29)
-				    fill_color 	13434879
-				    nlines     	5
-				    max_width  	640
-				    label      	
-|Created/modified by: <name>
-|Date: <creation/modification date>
-|
-|Approved by: <name>
-|Date: <approval date>
-				    )
-				line_color 	3342489
-				fill_color 	13434879
-				width      	700
-				height     	275)))))
-	    (object Class_Category "Use-Case Model"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"M:\\DST\\analysis\\UseCases.cat"
-		quid       	"35B677F4010E"))
-	logical_presentations 	(list unit_reference_list
-	    (object UseCaseDiagram "Main"
-		quid       	"35C6339B029F"
-		title      	"Main"
-		documentation 	
-|This diagram depicts the relationships between the packages (models) contained in the 'Use-Case View": the Use-Case Model (for the system) and the Business Use-Case Model (describing the business).
-		
-		zoom       	90
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list
-		    (object CategoryView "Use Case View::Use-Case Model" @3
-			location   	(400, 864)
-			font       	(object Font
-			    size       	10)
-			label      	(object ItemLabel
-			    Parent_View 	@3
-			    location   	(256, 780)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"Use-Case Model")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"35B677F4010E"
-			width      	300
-			height     	180)
-		    (object NoteView @4
-			location   	(1168, 592)
-			font       	(object Font
-			    size       	10)
-			label      	(object ItemLabel
-			    Parent_View 	@4
-			    location   	(941, 390)
-			    fill_color 	13434879
-			    nlines     	9
-			    max_width  	419
-			    label      	"The Use-Case Model is traceable to (and derives from) the Business Model.  The system (as described in the Use Case Model) provides behavior that supports the business.")
-			line_color 	3342489
-			fill_color 	13434879
-			width      	479
-			height     	416)
-		    (object CategoryView "Use Case View::Business Use-Case Model" @5
-			location   	(384, 320)
-			label      	(object ItemLabel
-			    Parent_View 	@5
-			    location   	(189, 229)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	390
-			    justify    	0
-			    label      	"Business Use-Case Model")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"35B677D701B8"
-			width      	403
-			height     	194)
-		    (object ImportView "" @6
-			stereotype 	TRUE
-			line_color 	3342489
-			quidu      	"35C633DA030C"
-			client     	@3
-			supplier   	@5
-			line_style 	0)
-		    (object AttachView "" @7
-			stereotype 	TRUE
-			line_color 	3342489
-			client     	@6
-			supplier   	@4
-			line_style 	0)))))
-    root_category 	(object Class_Category "Logical View"
-	quid       	"34DBB4830141"
-	documentation 	
-|Rational Unified Process uses the "Logical View in Rose" to organize the Design Model  and the Process View and the optional Business Object Model and Analysis Model.
-	
-	exportControl 	"Public"
-	global     	TRUE
-	subsystem  	"Component View"
-	quidu      	"34DBB4830143"
-	logical_models 	(list unit_reference_list
-	    (object Class_Category "Analysis Model"
-		quid       	"35B678170028"
-		documentation 	
-|This model is optional.
-|The Analysis Model contains a set of Analysis Classes, which describe an abstract realization of the use cases of the system.  The analysis classes evolve into associated design elements which are modeled in the Design Model.  
-		
-		exportControl 	"Public"
-		logical_models 	(list unit_reference_list
-		    (object Class_Category "Business Object Model"
-			is_unit    	TRUE
-			is_loaded  	FALSE
-			file_name  	"M:\\DST\\analysis\\LogicalBusinessObjects.cat"
-			quid       	"35B678080064")
-		    (object Class_Category "TZ Compiler"
-			is_unit    	TRUE
-			is_loaded  	FALSE
-			file_name  	"M:\\DST\\analysis\\TZCOMPILER.CAT"
-			quid       	"40E569BC024F")
-		    (object Class_Category "LTClasses"
-			is_unit    	TRUE
-			is_loaded  	FALSE
-			file_name  	"M:\\DST\\analysis\\Classes.cat"
-			quid       	"40A89DC203B0")
-		    (object Class_Category "Time Zone Database Management"
-			is_unit    	TRUE
-			is_loaded  	FALSE
-			file_name  	"M:\\DST\\analysis\\LogicalTZDBM.cat"
-			quid       	"40B1E4A6003A")
-		    (object Class_Category "Local Time Conversion"
-			is_unit    	TRUE
-			is_loaded  	FALSE
-			file_name  	"M:\\DST\\analysis\\LogicalLocaltimeConv.cat"
-			quid       	"40B1D43200B7")
-		    (object Class_Category "System Time Management"
-			is_unit    	TRUE
-			is_loaded  	FALSE
-			file_name  	"M:\\DST\\analysis\\LogicalSysTimeMngmt.cat"
-			quid       	"40B1D49203C5")
-		    (object Class_Category "TZClasses"
-			is_unit    	TRUE
-			is_loaded  	FALSE
-			file_name  	"M:\\DST\\analysis\\TZClasses.cat"
-			quid       	"40F3CEAF0324")
-		    (object Class_Category "BClasses"
-			is_unit    	TRUE
-			is_loaded  	FALSE
-			file_name  	"M:\\DST\\analysis\\BClasses.cat"
-			quid       	"40F3CFB10172"))
-		logical_presentations 	(list unit_reference_list))
-	    (object Class_Category "Design Model"
-		quid       	"35B6782302DA"
-		documentation 	
-|The Design Model in Rational Unified Process.
-|The design model is adapted to model the real implementation environment, and serves as an abstraction of the source code. It is a "blueprint" of how the source code is structured and written. 
-|
-|The design model is a hierarchy of packages (design subsystems and design-service  packages), with "leaves" that are classes. Subsystems are a design "view" of the components that are defined in the Implementation Model.
-|
-|The design model hierarchy consists of layers. 
-|
-|Classes represent abstractions of classes in the system's implementation. They define the objects, which in turn are abstractions of the objects in the system's implementation. The use cases are realized by the objects, and this is represented by use-case realizations in the Design Model.  Each use-case realization has a realize dependency to a use case in the Use-Case Model. 
-		
-		exportControl 	"Public"
-		logical_models 	(list unit_reference_list
-		    (object Class_Category "<Layer Name> Layer"
-			quid       	"34E3686A00F0"
-			documentation 	
-|The design model is normally organized in layers. The number of layers is not fixed, but varies from situation to situation. 
-|
-|During architectural analysis, focus is normally on the two high-level layers, that is, the application and business-specific layers;  this is what is meant by the "high-level organization of subsystems." The other lower-level layers are in focus during architectural design, refer to the activity Architectural Design for more information.
-|
-|Layers are identified using the naming conventions shown in the name of this package. 
-			
-			exportControl 	"Public"
-			logical_models 	(list unit_reference_list
-			    (object Class_Category "<package name>"
-				quid       	"34E36BB7017C"
-				documentation 	
-|<Enter a short description of the package here.  A package should be used in cases where a set of classes and/or other packages need to be grouped together for model organization purposes.  Though the contents of the package can have public visibility, which makes them visible to model elements outside the containing package, packages are primarily just grouping mechanisms.  
-|
-|If a set of classes is to be encapsulated and can be hidden behind a well-defined interface, a subsystem is a more appropriate container>
-				
-				exportControl 	"Public"
-				logical_models 	(list unit_reference_list)
-				logical_presentations 	(list unit_reference_list
-				    (object ClassDiagram "<package name> - Dependencies"
-					quid       	"37BC2256004D"
-					title      	"<package name> - Dependencies"
-					documentation 	"This diagram shows the package itself and the packages that it is dependent of. That is useful to know for instance when the package is a separate unit that can be reused in other systems."
-					zoom       	100
-					max_height 	28350
-					max_width  	21600
-					origin_x   	0
-					origin_y   	0
-					items      	(list diagram_item_list))
-				    (object ClassDiagram "<package name> - Interfaces"
-					quid       	"37BC226D026D"
-					title      	"<package name> - Interfaces"
-					documentation 	"This diagram shows only the classes that are visible outside this package. The interfaces of the package."
-					zoom       	100
-					max_height 	28350
-					max_width  	21600
-					origin_x   	0
-					origin_y   	0
-					items      	(list diagram_item_list))))
-			    (object Class_Category "<Subsystem Name>"
-				quid       	"35C0F38200B4"
-				documentation 	
-|<Enter a short description of the subsystem here.  A subsystem should be used in cases where a set of classes and/or other packages need to be encapsulated within a container and hidden behind a set of well-defined interfaces.  By convention, none of the contents of subsystem are visible except the interfaces of the subsystem.  This allows subsystems to be easily replaced, and the implementations changed, provided the interfaces remain unchanged.  It offers a degree of encapsulation greater than that of the package.
-|
-|If a set of classes is merely to be grouped together, but public visibility of classes is still desirable, a package is a more appropriate container.>
-				
-				stereotype 	"subsystem"
-				exportControl 	"Public"
-				logical_models 	(list unit_reference_list)
-				logical_presentations 	(list unit_reference_list
-				    (object ClassDiagram "<subsystem name> - Dependencies"
-					quid       	"35C0F4220190"
-					title      	"<subsystem name> - Dependencies"
-					documentation 	"This diagram shows the package itself and the packages that it is dependent of. That is useful to know for instance when the package is a separate unit that can be reused in other systems."
-					zoom       	100
-					max_height 	28350
-					max_width  	21600
-					origin_x   	0
-					origin_y   	0
-					items      	(list diagram_item_list))
-				    (object ClassDiagram "<subsystem name> - Interfaces"
-					quid       	"37BC21080165"
-					title      	"<subsystem name> - Interfaces"
-					documentation 	
-|The Process View in Rational Unified Process
-|This package is used to organize the active classes in the system and will be presented in the SoDA-generated Software Architecture Document, under the "Process View"
-					
-					zoom       	100
-					max_height 	28350
-					max_width  	21600
-					origin_x   	0
-					origin_y   	0
-					items      	(list diagram_item_list)))))
-			logical_presentations 	(list unit_reference_list
-			    (object ClassDiagram "All Packages in <Layer Name> - Layer"
-				quid       	"34E36C2903C0"
-				title      	"All Packages in <Layer Name> - Layer"
-				documentation 	"This diagram shows all packages in this - Layer."
-				zoom       	100
-				max_height 	28350
-				max_width  	21600
-				origin_x   	0
-				origin_y   	0
-				items      	(list diagram_item_list))))
-		    (object Class_Category "Use-Case Realizations"
-			quid       	"34E36D3203CA"
-			documentation 	
-|In this Package we will describe "Use Case Realizations" as stereotyped use cases.
-|
-|A use-case realization describes how a particular use case is realized within  the design model, in terms of collaborating objects.
-|
-|A realize dependency is used between the "Use Case Realization" and the "Use Case" in the use-case  model that is realized. 
-|
-|
-			
-			exportControl 	"Public"
-			logical_models 	(list unit_reference_list
-			    (object Association "$UNNAMED$0"
-				quid       	"35409E9D02A8"
-				stereotype 	"realize"
-				roles      	(list role_list
-				    (object Role "$UNNAMED$1"
-					quid       	"35409E9E0294"
-					supplier   	"Use Case View::Use-Case Model::Use Cases::<Use Case Name>::<Use Case Name>"
-					quidu      	"34E37FB203D4"
-					is_navigable 	TRUE)
-				    (object Role "$UNNAMED$2"
-					quid       	"35409E9E0295"
-					supplier   	"Logical View::Design Model::Use-Case Realizations::<Use-Case Name>::<Use-Case Name>"
-					quidu      	"352F38180276")))
-			    (object Class_Category "<Use-Case Name>"
-				quid       	"35D083E100BE"
-				documentation 	" A separate package is recommended for each Use Case Realization to facilitate access and version control of related use case artifacts."
-				exportControl 	"Public"
-				logical_models 	(list unit_reference_list
-				    (object UseCase "<Use-Case Name>"
-					attributes 	(list Attribute_Set
-					    (object Attribute
-						tool       	"RequisitePro"
-						name       	"ReqProProjectPath"
-						value      	"")
-					    (object Attribute
-						tool       	"RequisitePro"
-						name       	"ReqProProjectGuid"
-						value      	"")
-					    (object Attribute
-						tool       	"RequisitePro"
-						name       	"ReqProDocumentName"
-						value      	"")
-					    (object Attribute
-						tool       	"RequisitePro"
-						name       	"ReqProDocumentGuid"
-						value      	"")
-					    (object Attribute
-						tool       	"RequisitePro"
-						name       	"ReqProDocType"
-						value      	"")
-					    (object Attribute
-						tool       	"RequisitePro"
-						name       	"ReqProReqType"
-						value      	"")
-					    (object Attribute
-						tool       	"RequisitePro"
-						name       	"ReqProRequirementId"
-						value      	""))
-					quid       	"352F38180276"
-					documentation 	
-|This will be a stereotype on a usecase. 
-|In UML it is a stereotype on a collaboration and that does not exist in Rose.
-					
-					stereotype 	"use-case realization"
-					logical_models 	(list unit_reference_list
-					    (object Mechanism @8
-						logical_models 	(list unit_reference_list))
-					    (object Mechanism @9
-						logical_models 	(list unit_reference_list)))
-					logical_presentations 	(list unit_reference_list
-					    (object ClassDiagram "<Use Case Name> -  Realize Dependencies"
-						quid       	"37BC23B801F1"
-						title      	"<Use Case Name> -  Realize Dependencies"
-						documentation 	"This diagram shows the Use Case and the Use Case Realization and the realize dependency between them.  This information is used to connect the use case with the use case realization."
-						zoom       	100
-						max_height 	28350
-						max_width  	21600
-						origin_x   	0
-						origin_y   	0
-						items      	(list diagram_item_list))
-					    (object ClassDiagram "<Use Case Name> -  Participating Classes"
-						quid       	"37BC23E0036B"
-						title      	"<Use Case Name> -  Participating Classes"
-						documentation 	"This Diagram shows all participating classes in this Use Case Realization"
-						zoom       	100
-						max_height 	28350
-						max_width  	21600
-						origin_x   	0
-						origin_y   	0
-						items      	(list diagram_item_list))
-					    (object InteractionDiagram "<Use Case Name> -  Basic Flow"
-						mechanism_ref 	@8
-						quid       	"35081E3603A2"
-						title      	"<Use Case Name> -  Basic Flow"
-						zoom       	100
-						max_height 	28350
-						max_width  	21600
-						origin_x   	0
-						origin_y   	0
-						items      	(list diagram_item_list))
-					    (object InteractionDiagram "<Use Case Name> -  <Flow Type>"
-						mechanism_ref 	@9
-						quid       	"3540A0B901AE"
-						title      	"<Use Case Name> -  <Flow Type>"
-						zoom       	100
-						max_height 	28350
-						max_width  	21600
-						origin_x   	0
-						origin_y   	0
-						items      	(list diagram_item_list)))))
-				logical_presentations 	(list unit_reference_list
-				    (object ClassDiagram "Realize Dependency"
-					quid       	"34E39DA90302"
-					title      	"Realize Dependency"
-					documentation 	"This diagram shows the Use Case and the Use Case Realization and the realizes dependency between them."
-					zoom       	100
-					max_height 	28350
-					max_width  	21600
-					origin_x   	0
-					origin_y   	0
-					items      	(list diagram_item_list
-					    (object NoteView @10
-						location   	(704, 144)
-						label      	(object ItemLabel
-						    Parent_View 	@10
-						    location   	(38, 25)
-						    fill_color 	13434879
-						    nlines     	5
-						    max_width  	1296
-						    label      	
-|
-|This diagram shows the Use Case and the Use Case Realization and the realize dependency between them.
-						    )
-						line_color 	3342489
-						fill_color 	13434879
-						width      	1356
-						height     	250)
-					    (object UseCaseView "Use Case View::Use-Case Model::Use Cases::<Use Case Name>::<Use Case Name>" @11
-						location   	(1152, 528)
-						label      	(object ItemLabel
-						    Parent_View 	@11
-						    location   	(1152, 666)
-						    anchor_loc 	1
-						    nlines     	2
-						    max_width  	631
-						    justify    	0
-						    label      	"<Use Case Name>")
-						icon_style 	"Icon"
-						line_color 	3342489
-						fill_color 	13434879
-						quidu      	"34E37FB203D4"
-						autoResize 	TRUE)
-					    (object UseCaseView "Logical View::Design Model::Use-Case Realizations::<Use-Case Name>::<Use-Case Name>" @12
-						location   	(608, 960)
-						label      	(object ItemLabel
-						    Parent_View 	@12
-						    location   	(608, 1148)
-						    anchor_loc 	1
-						    nlines     	2
-						    max_width  	651
-						    justify    	0
-						    label      	"<Use-Case Name>")
-						stereotype 	(object ItemLabel
-						    Parent_View 	@12
-						    location   	(608, 1078)
-						    anchor     	10
-						    anchor_loc 	1
-						    nlines     	1
-						    max_width  	434
-						    justify    	0
-						    label      	"<<use-case realization>>")
-						icon       	"use-case realization"
-						icon_style 	"Icon"
-						line_color 	3342489
-						fill_color 	13434879
-						quidu      	"352F38180276"
-						autoResize 	TRUE)
-					    (object AssociationViewNew "$UNNAMED$0" @13
-						location   	(876, 741)
-						stereotype 	(object SegLabel @14
-						    Parent_View 	@13
-						    location   	(874, 746)
-						    anchor     	10
-						    anchor_loc 	1
-						    nlines     	1
-						    max_width  	450
-						    justify    	0
-						    label      	"<<realize>>"
-						    pctDist    	0.483333
-						    height     	5
-						    orientation 	1)
-						line_color 	3342489
-						quidu      	"35409E9D02A8"
-						roleview_list 	(list RoleViews
-						    (object RoleView "$UNNAMED$1" @15
-							Parent_View 	@13
-							location   	(236, -539)
-							stereotype 	TRUE
-							line_color 	3342489
-							quidu      	"35409E9E0294"
-							client     	@13
-							supplier   	@11
-							line_style 	0)
-						    (object RoleView "$UNNAMED$2" @16
-							Parent_View 	@13
-							location   	(236, -539)
-							stereotype 	TRUE
-							line_color 	3342489
-							quidu      	"35409E9E0295"
-							client     	@13
-							supplier   	@12
-							line_style 	0))))))))
-			logical_presentations 	(list unit_reference_list))
-		    (object Class_Category "Process View"
-			quid       	"35D227B103C0"
-			documentation 	"An architectural view that describes the concurrent aspect of the system: tasks (processes) and their interactions."
-			exportControl 	"Public"
-			logical_models 	(list unit_reference_list
-			    (object Class "<Process Name>"
-				quid       	"35DB3C8302D0"
-				documentation 	"This process provides <enter a description here of what the role of the process in the system is>.  A separate process was chosen for this to be able to <enter the rationale for needing a separate process>."
-				stereotype 	"process")
-			    (object Class "<Thread Name>"
-				quid       	"35DB3CB002BC"
-				documentation 	"This is a sub-process or thread within the <name of process of which this thread is a sub-process> process which handles <enter a description of what this thread does>.  A separate thread was chosen for this to be able to <enter the rationale for creating a separate thread>."
-				stereotype 	"thread")
-			    (object Association "$UNNAMED$3"
-				quid       	"35DB3E72017C"
-				roles      	(list role_list
-				    (object Role "$UNNAMED$4"
-					quid       	"35DB3E73005A"
-					supplier   	"Logical View::Design Model::Process View::<Process Name>"
-					quidu      	"35DB3C8302D0"
-					is_navigable 	TRUE
-					is_aggregate 	TRUE)
-				    (object Role "$UNNAMED$5"
-					quid       	"35DB3E730096"
-					supplier   	"Logical View::Design Model::Process View::<Thread Name>"
-					quidu      	"35DB3CB002BC"
-					Containment 	"By Value"
-					is_navigable 	TRUE))))
-			logical_presentations 	(list unit_reference_list
-			    (object ClassDiagram "Process View"
-				quid       	"35DB3C2A02B2"
-				title      	"Process View"
-				documentation 	"This diagram illustrates the composition of processes and threads, and the mapping of classes onto those processes and threads."
-				zoom       	100
-				max_height 	28350
-				max_width  	21600
-				origin_x   	0
-				origin_y   	0
-				items      	(list diagram_item_list
-				    (object ClassView "Class" "Logical View::Design Model::Process View::<Process Name>" @17
-					ShowCompartmentStereotypes 	TRUE
-					IncludeAttribute 	TRUE
-					IncludeOperation 	TRUE
-					location   	(288, 464)
-					label      	(object ItemLabel
-					    Parent_View 	@17
-					    location   	(122, 436)
-					    fill_color 	13434879
-					    nlines     	1
-					    max_width  	332
-					    justify    	0
-					    label      	"<Process Name>")
-					stereotype 	(object ItemLabel
-					    Parent_View 	@17
-					    location   	(122, 389)
-					    fill_color 	13434879
-					    anchor     	10
-					    nlines     	1
-					    max_width  	332
-					    justify    	0
-					    label      	"<<process>>")
-					icon_style 	"Icon"
-					line_color 	3342489
-					fill_color 	13434879
-					quidu      	"35DB3C8302D0"
-					width      	350
-					height     	172
-					annotation 	8
-					autoResize 	TRUE)
-				    (object ClassView "Class" "Logical View::Design Model::Process View::<Thread Name>" @18
-					ShowCompartmentStereotypes 	TRUE
-					IncludeAttribute 	TRUE
-					IncludeOperation 	TRUE
-					location   	(896, 464)
-					label      	(object ItemLabel
-					    Parent_View 	@18
-					    location   	(740, 436)
-					    fill_color 	13434879
-					    nlines     	1
-					    max_width  	312
-					    justify    	0
-					    label      	"<Thread Name>")
-					stereotype 	(object ItemLabel
-					    Parent_View 	@18
-					    location   	(740, 389)
-					    fill_color 	13434879
-					    anchor     	10
-					    nlines     	1
-					    max_width  	312
-					    justify    	0
-					    label      	"<<thread>>")
-					icon_style 	"Icon"
-					line_color 	3342489
-					fill_color 	13434879
-					quidu      	"35DB3CB002BC"
-					width      	330
-					height     	172
-					annotation 	8
-					autoResize 	TRUE)
-				    (object AssociationViewNew "$UNNAMED$3" @19
-					location   	(596, 464)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"35DB3E72017C"
-					roleview_list 	(list RoleViews
-					    (object RoleView "$UNNAMED$4" @20
-						Parent_View 	@19
-						location   	(-300, 0)
-						stereotype 	TRUE
-						line_color 	3342489
-						quidu      	"35DB3E73005A"
-						client     	@19
-						supplier   	@17
-						line_style 	0)
-					    (object RoleView "$UNNAMED$5" @21
-						Parent_View 	@19
-						location   	(-300, 0)
-						stereotype 	TRUE
-						line_color 	3342489
-						quidu      	"35DB3E730096"
-						client     	@19
-						supplier   	@18
-						line_style 	0))))))))
-		logical_presentations 	(list unit_reference_list
-		    (object ClassDiagram "Architecturally Significant Model Elements"
-			quid       	"34E36BDE02C6"
-			title      	"Architecturally Significant Model Elements"
-			documentation 	"Elements of the Design Model which are considered architecturally significant should be presented in this diagram.  This diagram will be presented in the document generated using the SoDA Software Architecture Document."
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object NoteView @22
-				location   	(672, 304)
-				label      	(object ItemLabel
-				    Parent_View 	@22
-				    location   	(28, 19)
-				    fill_color 	13434879
-				    nlines     	13
-				    max_width  	1253
-				    label      	
-|
-|This diagram is just produced for architectural significant packages.
-|
-|This diagram shows the Architectural Significant Classes and Packages in this package. Only significant  operations and attributes are shown on the classes in this diagram.
-|
-|See Rational Unified Process:
-|Activity: Architectural Design
-|Step:  Include Architecturally Significant Model Elements in the Logical View 
-|
-|This will be a part of  the  "Software Architecture Document" :
-|- "Logical View" 
-|-     "Architecturally Significant Model Elements"
-				    )
-				line_color 	3342489
-				fill_color 	13434879
-				width      	1313
-				height     	582)
-			    (object NoteView @23
-				location   	(1696, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@23
-				    location   	(1358, 29)
-				    fill_color 	13434879
-				    nlines     	5
-				    max_width  	640
-				    label      	
-|Created/modified by: <name>
-|Date: <creation/modification date>
-|
-|Approved by: <name>
-|Date: <approval date>
-				    )
-				line_color 	3342489
-				fill_color 	13434879
-				width      	700
-				height     	275)))
-		    (object ClassDiagram "Architecture Overview - Package and Subsystem Layering"
-			quid       	"354A9751015E"
-			title      	"Architecture Overview - Package and Subsystem Layering"
-			documentation 	
-|This diagram depicts the organization of the design model into layers. This diagram will be presented in the document generated using the SoDA Software Architecture Document.  
-|
-|See Rational Unified Process:
-|Activity: Architectural Analysis
-|Step: Define the High-Level Organization of Subsystems
-|
-|Activity: Incorporate Existing Design Elements
-|Step: Update the Organization of the Design Model
-			
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object NoteView @24
-				location   	(576, 256)
-				label      	(object ItemLabel
-				    Parent_View 	@24
-				    location   	(44, 31)
-				    fill_color 	13434879
-				    nlines     	9
-				    max_width  	1028
-				    label      	
-|This diagram shows the design model layers.
-|
-|See Rational Unified Process:
-|Activity: Architectural Analysis
-|Step: Define the High-Level Organization of Subsystems
-|
-|Activity: Architectural Design
-|Step: Define the Low-level Organization of Subsystems
-				    )
-				line_color 	3342489
-				fill_color 	13434879
-				width      	1088
-				height     	463)
-			    (object NoteView @25
-				location   	(1520, 176)
-				label      	(object ItemLabel
-				    Parent_View 	@25
-				    location   	(1182, 45)
-				    fill_color 	13434879
-				    nlines     	5
-				    max_width  	640
-				    label      	
-|Created/modified by: <name>
-|Date: <creation/modification date>
-|
-|Approved by: <name>
-|Date: <approval date>
-				    )
-				line_color 	3342489
-				fill_color 	13434879
-				width      	700
-				height     	275))))))
-	logical_presentations 	(list unit_reference_list
-	    (object ClassDiagram "Welcome"
-		quid       	"3512226B0028"
-		title      	"Welcome"
-		documentation 	
-|Welcome to the Rational Unified Process Frame Work
-|
-|Purpose of the FrameWork:
-|a) provide a good structure for a Rose model
-|b) provide a style guide with naming conventions/suggestions
-|c) identify a minimal set of diagrams to produce
-|d) relate activities in RUP to Rose diagrams
-|e) provide a basis for sophisticated SoDA reports. For instance based on this structure most of the Rose parts of the "Software Architecture Document" are generated from SoDA.
-|
-		
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list
-		    (object NoteView @26
-			location   	(768, 384)
-			label      	(object ItemLabel
-			    Parent_View 	@26
-			    location   	(121, 96)
-			    fill_color 	13434879
-			    nlines     	14
-			    max_width  	1259
-			    label      	
-|Welcome to the Rational Unified Process Rose Model Framework
-|
-|Purpose of the Framework:
-|a) provide a good structure for a Rose model
-|b) provide a style guide with naming conventions/suggestions
-|c) identify a minimal set of diagrams to produce
-|d) relate activities in RUP to Rose diagrams
-|e) provide a basis for sophisticated SoDA reports. For instance based on this structure most of the Rose parts of the "Software Architecture Document" are generated from SoDA.
-			    )
-			line_color 	3342489
-			fill_color 	13434879
-			width      	1319
-			height     	588)
-		    (object CategoryView "Logical View::Analysis Model::TZ Compiler" @27
-			location   	(1136, 1008)
-			label      	(object ItemLabel
-			    Parent_View 	@27
-			    location   	(951, 924)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	370
-			    justify    	0
-			    label      	"TZ Compiler")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"40E569BC024F"
-			width      	382
-			height     	180)
-		    (object CategoryView "Logical View::Analysis Model::LTClasses" @28
-			location   	(432, 1008)
-			label      	(object ItemLabel
-			    Parent_View 	@28
-			    location   	(247, 924)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	370
-			    justify    	0
-			    label      	"LTClasses")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"40A89DC203B0"
-			width      	382
-			height     	180)
-		    (object CategoryView "Logical View::Analysis Model::Time Zone Database Management" @29
-			location   	(1872, 1040)
-			label      	(object ItemLabel
-			    Parent_View 	@29
-			    location   	(1638, 956)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	468
-			    justify    	0
-			    label      	"Time Zone Database Management")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"40B1E4A6003A"
-			width      	480
-			height     	180)
-		    (object CategoryView "Logical View::Analysis Model::Business Object Model" @30
-			location   	(512, 1408)
-			label      	(object ItemLabel
-			    Parent_View 	@30
-			    location   	(327, 1324)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	370
-			    justify    	0
-			    label      	"Business Object Model")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"35B678080064"
-			width      	382
-			height     	180)
-		    (object CategoryView "Logical View::Analysis Model::Local Time Conversion" @31
-			location   	(1728, 1392)
-			label      	(object ItemLabel
-			    Parent_View 	@31
-			    location   	(1543, 1308)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	370
-			    justify    	0
-			    label      	"Local Time Conversion")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"40B1D43200B7"
-			width      	382
-			height     	180)
-		    (object CategoryView "Logical View::Analysis Model::System Time Management" @32
-			location   	(1040, 1392)
-			label      	(object ItemLabel
-			    Parent_View 	@32
-			    location   	(855, 1308)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	370
-			    justify    	0
-			    label      	"System Time Management")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"40B1D49203C5"
-			width      	382
-			height     	180)))))
-    root_subsystem 	(object SubSystem "Component View"
-	quid       	"34DBB4830143"
-	documentation 	
-|In Rational Unified Process the  "Component View in Rose" is used to organize the implemetation model. 
-|
-|The Implementaition View in Rational Unified Process
-|
-|
-	
-	physical_models 	(list unit_reference_list
-	    (object SubSystem "Implementation Model"
-		quid       	"35B67C9A0348"
-		documentation 	
-|The Implementation Model in Rational Unified Process is a collection of components, and the implementation subsystems that contain them.
-|
-|An architectural view that describes one or several system configurations; the mapping of software components (tasks, modules) to the computing nodes in these configurations.
-|
-|Defines, executables, dll's, files, subsystems, compilation order etc.
-|
-|Rational Unified Process:
-|Activity: Define the Organization of Subsystems
-|
-|These diagram will be presented in the  Implementation  View section in the document generated using the SoDA Software Architecture Document.
-|
-|It is recommended that, in most cases, the mapping should be
-|1:1 between design and implementation, that is, for each package in design there is one subsystem in the implementation model.
-|
-		
-		physical_models 	(list unit_reference_list)
-		physical_presentations 	(list unit_reference_list
-		    (object Module_Diagram "Implementation Model Structure"
-			quid       	"34DBB487006E"
-			title      	"Implementation Model Structure"
-			documentation 	"This diagram presents the organization of the Implementation Model."
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object NoteView @33
-				location   	(624, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@33
-				    location   	(21, 26)
-				    fill_color 	13434879
-				    nlines     	5
-				    max_width  	1170
-				    label      	
-|
-|RationalUnified Process:
-|Activity: Structure the implementation model
-|Step: Create the Initial Implementation Model Structure
-				    )
-				line_color 	3342489
-				fill_color 	13434879
-				width      	1230
-				height     	281)))))
-	    (object SubSystem "Components Analysis"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"M:\\DST\\analysis\\Components.sub"
-		quid       	"40D969B300E0"))
-	physical_presentations 	(list unit_reference_list
-	    (object Module_Diagram "Main"
-		quid       	"35C6339B029E"
-		title      	"Main"
-		documentation 	"This diagram, required by Rose, simply provides a way of navigating to the Implementation Model."
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list
-		    (object SubSysView "Component View::Implementation Model" @34
-			location   	(736, 800)
-			label      	(object ItemLabel
-			    Parent_View 	@34
-			    location   	(552, 713)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	368
-			    justify    	0
-			    label      	"Implementation Model")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"35B67C9A0348"
-			width      	381
-			height     	187)
-		    (object SubSysView "Component View::Components Analysis" @35
-			location   	(1408, 1392)
-			label      	(object ItemLabel
-			    Parent_View 	@35
-			    location   	(1264, 1323)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"Components Analysis")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"40D969B300E0"
-			width      	300
-			height     	150)))))
-    process_structure 	(object Processes
-	quid       	"34DBB4830144"
-	ProcsNDevs 	(list
-	    (object Processor "<processor name>"
-		quid       	"34DBBD4300B4"
-		documentation 	"This node provides <enter a short description here of the functionality and capability of the node>."
-		connections 	(list connection_list
-		    (object Connection_Relationship
-			quid       	"34DBBD4B008C"
-			supplier   	"<device name>"
-			quidu      	"34DBBD47019A"
-			supplier_is_device 	TRUE))
-		characteristics 	""
-		scheduling 	"Preemptive"
-		processes  	(list processes
-		    (object Process "<process name>"
-			quid       	"35DB411001D6"
-			documentation 	"This process corresponds to the process with the same name in the Logical View::Process Model."
-			stereotype 	"process"
-			priority   	"")
-		    (object Process "<thread name>"
-			quid       	"35DB41720348"
-			documentation 	"This process corresponds to the thread with the same name in the Logical View::Process Model."
-			stereotype 	"thread"
-			priority   	"")))
-	    (object Device "<device name>"
-		quid       	"34DBBD47019A"
-		documentation 	"This device provides <enter a short description of the capability the device provides> for the system."
-		characteristics 	"")
-	    (object Process_Diagram "Deployment View"
-		quid       	"34DBB4830146"
-		title      	"Deployment View"
-		documentation 	
-|The Deployment View in Rational Unified Process
-|
-|Defines the typical physical network configurations, including those typically used by end users, as well as special configurations used for development and test.
-|
-|See Rational Unified Process:
-|Activity: Describe Distribution
-|
-|This diagram will be a part of  the SoDA template-generated Software Architecture Document under the "Deployment  View" .
-		
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list
-		    (object ProcessorView "<processor name>" @36
-			location   	(512, 1056)
-			label      	(object ItemLabel
-			    Parent_View 	@36
-			    location   	(276, 900)
-			    nlines     	2
-			    max_width  	400
-			    justify    	0
-			    label      	"<processor name>")
-			icon_style 	"Label"
-			quidu      	"34DBBD4300B4"
-			width      	475
-			height     	381
-			annotation 	3)
-		    (object DeviceView "<device name>" @37
-			location   	(1040, 1056)
-			label      	(object ItemLabel
-			    Parent_View 	@37
-			    location   	(867, 950)
-			    nlines     	2
-			    max_width  	275
-			    justify    	0
-			    label      	"<device name>")
-			icon_style 	"Icon"
-			quidu      	"34DBBD47019A"
-			width      	350
-			height     	282
-			annotation 	0)
-		    (object ConnectionView "" @38
-			stereotype 	TRUE
-			quidu      	"34DBBD4B008C"
-			client     	@36
-			supplier   	@37
-			line_style 	0)
-		    (object NoteView @39
-			location   	(816, 304)
-			label      	(object ItemLabel
-			    Parent_View 	@39
-			    location   	(38, 29)
-			    fill_color 	13434879
-			    nlines     	11
-			    max_width  	1521
-			    label      	
-|This Diagram defines the typical physical network configurations, including those typically used by end users, as well as special configurations used for development and test.
-|
-|· Allocate processes to the various nodes. Allocation takes into account the capacity of the nodes (in terms of
-|both memory and processing), bandwidth of the communication medium (bus, LANs, WANs), and the
-|availability of the hardware and communication links, rerouting, and so on.
-|
-|See, Rational Unified Process:
-|Activity: Describe Distribution
-			    )
-			line_color 	3342489
-			fill_color 	13434879
-			width      	1581
-			height     	563)))))
-    properties 	(object Properties
-	attributes 	(list Attribute_Set
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"propertyId"
-		value      	"783606378")
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"CreatableSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Private"
-				value      	221)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"PublicNotCreatable"
-				value      	213)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"SingleUse"
-				value      	214)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalSingleUse"
-				value      	215)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"MultiUse"
-				value      	219)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalMultiUse"
-				value      	220)))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionBase"
-			value      	("BaseSet" 222))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionExplicit"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionCompare"
-			value      	("CompareSet" 202))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Creatable"
-			value      	("CreatableSet" 221))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateInitialization"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateTermination"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"CollectionClass"
-			value      	"Collection")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"CompareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"(none)"
-				value      	202)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Binary"
-				value      	203)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Text"
-				value      	204)))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateModel"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"InstancingSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Private"
-				value      	221)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"PublicNotCreatable"
-				value      	213)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"SingleUse"
-				value      	214)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalSingleUse"
-				value      	215)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"MultiUse"
-				value      	219)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalMultiUse"
-				value      	220)))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"BaseSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"(none)"
-				value      	222)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"0"
-				value      	223)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"1"
-				value      	224)))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Instancing"
-			value      	("InstancingSet" 221))))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OperationName"
-			value      	"$operation")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"LibraryName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"AliasName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"IsStatic"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ExitCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ReplaceExistingBody"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"DefaultBody"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"IsConst"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"New"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"WithEvents"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Subscript"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"NameIfUnlabeled"
-			value      	"the$supplier")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateGetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateSetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateLetOperation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"New"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"WithEvents"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Subscript"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"NameIfUnlabeled"
-			value      	"the$supplier")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateGetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateSetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateLetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"FullName"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ImplementsDelegation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"FullName"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProjectFile"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateModel"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ImportReferences"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"QuickImport"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"VisualStudio"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Repository"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"SCC"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"propertyId"
-		value      	"360000002")
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"DDLScriptFilename"
-			value      	"DDL1.SQL")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"DropClause"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"PrimaryKeyColumnName"
-			value      	"_ID")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"PrimaryKeyColumnType"
-			value      	"NUMBER(5,0)")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"SchemaNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"SchemaNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TableNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TypeNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TypeNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ViewNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ViewNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"VarrayNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"VarrayNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NestedTableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NestedTableNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ObjectTableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ObjectTableNameSuffix"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsSchema"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OID"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"WhereClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CheckConstraint"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypeLength"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypePrecision"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypeScale"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionOfREFS"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"MethodKind"
-			value      	("MethodKindSet" 1903))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OverloadID"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsReadNoDataState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsReadNoProcessState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsWriteNoDataState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsWriteNoProcessState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsSelfish"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerType"
-			value      	("TriggerTypeSet" 1801))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerEvent"
-			value      	("TriggerEventSet" 1601))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerText"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerReferencingNames"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerForEach"
-			value      	("TriggerForEachSet" 1701))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerWhenClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"MethodKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"MapMethod"
-				value      	1901)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"OrderMethod"
-				value      	1902)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Function"
-				value      	1903)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Procedure"
-				value      	1904)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Operator"
-				value      	1905)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Constructor"
-				value      	1906)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Destructor"
-				value      	1907)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Trigger"
-				value      	1908)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Calculated"
-				value      	1909)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"AFTER"
-				value      	1801)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"BEFORE"
-				value      	1802)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSTEAD OF"
-				value      	1803)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerForEachSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"ROW"
-				value      	1701)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"STATEMENT"
-				value      	1702)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerEventSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT"
-				value      	1601)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"UPDATE"
-				value      	1602)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"DELETE"
-				value      	1603)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR UPDATE"
-				value      	1604)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR DELETE"
-				value      	1605)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"UPDATE OR DELETE"
-				value      	1606)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR UPDATE OR DELETE"
-				value      	1607)))))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NullsAllowed"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Precision"
-			value      	"2")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Scale"
-			value      	"6")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsIndex"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsPrimaryKey"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CompositeUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CheckConstraint"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"cg"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"UseMSVC"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileExtension"
-			value      	"h")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileBackupExtension"
-			value      	"h~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileTemporaryExtension"
-			value      	"h#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"PrecompiledHeader"
-			value      	"stdafx.h")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileExtension"
-			value      	"cpp")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileBackupExtension"
-			value      	"cp~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileTemporaryExtension"
-			value      	"cp#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"PathSeparator"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileNameFormat"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BooleanType"
-			value      	"int")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowTemplates"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowProtectedInheritance"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CommentWidth"
-			value      	60)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByValueContainer"
-			value      	"$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByValueContainer"
-			value      	"OptionalByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByValueContainer"
-			value      	"BoundedListByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByValueContainer"
-			value      	"BoundedSetByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByReferenceContainer"
-			value      	"BoundedListByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByReferenceContainer"
-			value      	"BoundedSetByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByValueContainer"
-			value      	"UnboundedListByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByValueContainer"
-			value      	"UnboundedSetByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByReferenceContainer"
-			value      	"UnboundedListByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByReferenceContainer"
-			value      	"UnboundedSetByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByValueContainer"
-			value      	"AssociationByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByValueContainer"
-			value      	"DictionaryByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByReferenceContainer"
-			value      	"AssociationByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByReferenceContainer"
-			value      	"DictionaryByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GeneratePreserveRegions"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExplicitInstantiations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AlwaysKeepOrphanedCode"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowGenerateOverNewerAnnotations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowGenerateOverNewerVersion"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ImplementationType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ClassKey"
-			value      	"class")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"PutBodiesInSpec"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDefaultConstructor"
-			value      	("GenerateSet" 206))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DefaultConstructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExplicitDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateCopyConstructor"
-			value      	("GenerateSet" 206))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyConstructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExplicitCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDestructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DestructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DestructorKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDestructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssignmentOperation"
-			value      	("GenerateSet" 206))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssignmentVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssignmentKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssignmentOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEqualityOperations"
-			value      	("GenerateSet" 206))
-		    (object Attribute
-			tool       	"cg"
-			name       	"EqualityVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"EqualityKind"
-			value      	("FriendKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineEqualityOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateRelationalOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"RelationalVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"RelationalKind"
-			value      	("FriendKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineRelationalOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateStorageMgmtOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StorageMgmtVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineStorageMgmtOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSubscriptOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSubscriptOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDereferenceOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDereferenceOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateIndirectionOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineIndirectionOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateStreamOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StreamVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineStreamOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ThreeKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"KindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FriendKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"DeclareAndDefine"
-				value      	199)
-			    (object Attribute
-				tool       	"cg"
-				name       	"DeclareOnly"
-				value      	205)
-			    (object Attribute
-				tool       	"cg"
-				name       	"DoNotDeclare"
-				value      	206)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"VisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ConstValue"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDefaultSpecifier"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DefaultSpecifier"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExtensionlessFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeFormat"
-			value      	(value Text 
-|// $package
-|#include "$file"
-|
-			))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludePrecompiledHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeOrder"
-			value      	"AMIR")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyle"
-			value      	("InliningStyleSet" 207))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"InClassDeclaration"
-				value      	208)
-			    (object Attribute
-				tool       	"cg"
-				name       	"FollowingClassDeclaration"
-				value      	207)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"TypesDefined"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeClosure"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExtensionlessFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeFormat"
-			value      	(value Text 
-|// $package
-|#include "$file"
-|
-			))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludePrecompiledHeader"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeOrder"
-			value      	"AMIR")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyle"
-			value      	("InliningStyleSet" 207))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"InClassDeclaration"
-				value      	208)
-			    (object Attribute
-				tool       	"cg"
-				name       	"FollowingClassDeclaration"
-				value      	207)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"TypesDefined"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeClosure"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationKind"
-			value      	("OperationKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsConst"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsExplicit"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExitCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"BodyAnnotations"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsOneWay"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Context"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"Raises"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CCRegion"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAbstractBody"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"Ordered"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$supplier")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedHasRelType"
-			value      	("HasRelTypeSet" 47))
-		    (object Attribute
-			tool       	"cg"
-			name       	"HasRelTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Association"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$targetClass")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"InstanceArguments"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerGet"
-			value      	"$data.get($keys)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerSet"
-			value      	"$data.set($keys,$value)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedContainer"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassContainer"
-			value      	"$supplier *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassInitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetSetByReference"
-			value      	("QualifiedGetSetByReferenceSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetSetByReferenceSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_GetSetByReference"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateQualifiedGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineQualifiedGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateQualifiedSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedSetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedSetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineQualifiedSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberName"
-			value      	"$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssocClassGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassSetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassSetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssocClassSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassForwardReferenceOnly"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedRoleType"
-			value      	("AssocTypeSet" 47))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtAttributeVisibility"
-				value      	211)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CCRegion"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"BodyReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateForwardReference"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DirectoryIsOnSearchList"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"PrecompiledHeader"
-			value      	"stdafx.h")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsNamespace"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"Indent"
-			value      	2)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Version"
-			value      	"5.0")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCClassTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCClassTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Interface_Part"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Connection_Part"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Class_Factory"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CObjectFunctionality"
-			value      	("CObjectFunctionalitySet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CObjectFunctionalitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dynamic"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dyncreate"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Serial"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOverrideGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDataGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DATA_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateFieldGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_FIELD_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMessageGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMessageMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MESSAGE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEFactory"
-			value      	("OLEFactorySet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEFactorySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Built_in"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Simple"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Licensed"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEName"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEClassID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOLECtlType"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLECtlType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOLETypeLib"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibMajor"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibMinor"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GeneratePropPageIDs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEPropPageIDs"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDispatchMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockProperties"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockFunctions"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DispatchDefValue"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDispIdEnum"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISP_ID_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInterfaceMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"INTERFACE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"InitInterface"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateEventMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockEvents"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateEventSinkMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PropNotifySinks"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateConnectionMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CONNECTION_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"ConnectionPointIID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"InheritanceType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLECommands"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MFCDeclares"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"ATL_Declares"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateCOMMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"COM_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateConnectionPointMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CONNECTION_POINT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMsgMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GeneratePropertyMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PROPERTY_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MFCImplements"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCOperationTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCOperationTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Virtual_Override"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Message_Handler"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dispatch_Handler"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Event_Firing_Function"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Event_Sink_Handler"
-				value      	5)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Std_OLE_Method"
-				value      	6)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Command_Parser"
-				value      	7)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Get_Function"
-				value      	8)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Set_Function"
-				value      	9)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Notify_Function"
-				value      	10)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Macro_Generated_Function"
-				value      	11)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MESSAGE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"BodyImage"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateIncludesGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_INCLUDES_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInsertLocation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateIncludesGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_INCLUDES_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInsertLocation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"DDL"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"DDL"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DataBase"
-			value      	("DataBaseSet" 800))
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DataBaseSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"DDL"
-				name       	"ANSI"
-				value      	800)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"Oracle"
-				value      	801)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"SQLServer"
-				value      	802)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"Sybase"
-				value      	803)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"Watcom"
-				value      	804)))
-		    (object Attribute
-			tool       	"DDL"
-			name       	"PrimaryKeyColumnName"
-			value      	"Id")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"PrimaryKeyColumnType"
-			value      	"NUMBER(5)")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"ViewName"
-			value      	"V_")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"TableName"
-			value      	"T_")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"InheritSuffix"
-			value      	"_V")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DropClause"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"BaseViews"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DDLScriptFilename"
-			value      	"DDL1.SQL")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"Directory"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"DDL"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"DDL"
-			name       	"ColumnType"
-			value      	"VARCHAR")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"NullsOK"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"PrimaryKey"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"Unique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"CompositeUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"CheckConstraint"
-			value      	"")))
-	    (object Attribute
-		tool       	"DDL"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"framework"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"IDL"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"StopOnError"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GeneratePreserveRegions"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"ImplementationType"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"ConstValue"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDefaultSpecifier"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DefaultSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IDLElement"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IDLSpecificationType"
-			value      	("IDLSpecSet" 22))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IDLSpecSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Interface"
-				value      	22)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Typedef"
-				value      	54)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Enumeration"
-				value      	8)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Const"
-				value      	71)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Exception"
-				value      	61)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Struct"
-				value      	51)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Union"
-				value      	81)))))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateIDLModule"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"OperationIsOneWay"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Context"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Raises"
-			value      	"")))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsConst"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"ConstValue"
-			value      	"")))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"NameIfUnlabeled"
-			value      	"the_$supplier")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"BoundedHasRelType"
-			value      	("HasRelTypeSet" 47))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"HasRelTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"NameIfUnlabeled"
-			value      	"the_$supplier")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"BoundedRoleType"
-			value      	("AssocTypeSet" 47))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateForwardReference"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Directory"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Java"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"Java"
-			name       	"UsePrefixes"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"InstanceVariablePrefix"
-			value      	"m_")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ClassVariablePrefix"
-			value      	"s_")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultAttributeDataType"
-			value      	"int")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultOperationReturnType"
-			value      	"void")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Editor"
-			value      	("EditorType" 100))
-		    (object Attribute
-			tool       	"Java"
-			name       	"VM"
-			value      	("VMType" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"ClassPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EditorType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"BuiltIn"
-				value      	100)
-			    (object Attribute
-				tool       	"Java"
-				name       	"WindowsShell"
-				value      	101)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"VMType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Sun"
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Microsoft"
-				value      	201)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GlobalImports"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"OpenBraceClassStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UseTabs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UseSpaces"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"SpacingItems"
-			value      	3)
-		    (object Attribute
-			tool       	"Java"
-			name       	"CommentLength"
-			value      	2)
-		    (object Attribute
-			tool       	"Java"
-			name       	"RoseDefaultCommentStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"AsteriskCommentStyle"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavaCommentStyle"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocAuthor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDeprecated"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocException"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocParam"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocReturn"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocSee"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocSerial"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocSerialdata"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocSerialfield"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocSince"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocVersion"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocLink"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"private"
-				value      	64)
-			    (object Attribute
-				tool       	"Java"
-				name       	"package"
-				value      	65)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"CmIdentification"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"AdditionalImports"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"CmIdentification"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"AdditionalImports"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Abstract"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Native"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Synchronized"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultBody"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReplaceExistingBody"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Transient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Volatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"PropertyType"
-			value      	("BeanProperty_Set" 71))
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanProperty_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Not A Property"
-				value      	71)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Simple"
-				value      	72)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bound"
-				value      	73)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Constrained"
-				value      	74)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"IndividualChangeMgt"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write"
-			value      	("Read/Write_Set" 81))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read & Write"
-				value      	81)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read Only"
-				value      	82)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Write Only"
-				value      	83)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFullyQualifiedTypes"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Transient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Volatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"PropertyType"
-			value      	("BeanProperty_Set" 71))
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanProperty_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Not A Property"
-				value      	71)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Simple"
-				value      	72)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bound"
-				value      	73)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Constrained"
-				value      	74)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"IndividualChangeMgt"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write"
-			value      	("Read/Write_Set" 81))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read & Write"
-				value      	81)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read Only"
-				value      	82)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Write Only"
-				value      	83)))))
-	    (object Attribute
-		tool       	"Java"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Objectory41"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"TypeLibImporter"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"ROBE"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Editor"
-			value      	("EditorType" 100))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IncludePath"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"StopOnError"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"EditorType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"BuiltIn"
-				value      	100)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"WindowsShell"
-				value      	101)))))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ConstValue"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ImplementationType"
-			value      	"")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Context"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"OperationIsOneWay"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Order"
-			value      	"")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Order"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"BoundedRoleType"
-			value      	("AssocTypeSet" 47))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"GenerateForwardReference"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Rational Unified Process"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Rose Web Publisher"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"SoDA"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"COM"
-		name       	"propertyId"
-		value      	"783606378")
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"TypeKinds"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"COM"
-				name       	"enum"
-				value      	100)
-			    (object Attribute
-				tool       	"COM"
-				name       	"record"
-				value      	101)
-			    (object Attribute
-				tool       	"COM"
-				name       	"module"
-				value      	102)
-			    (object Attribute
-				tool       	"COM"
-				name       	"interface"
-				value      	103)
-			    (object Attribute
-				tool       	"COM"
-				name       	"dispinterface"
-				value      	104)
-			    (object Attribute
-				tool       	"COM"
-				name       	"coclass"
-				value      	105)
-			    (object Attribute
-				tool       	"COM"
-				name       	"alias"
-				value      	106)
-			    (object Attribute
-				tool       	"COM"
-				name       	"union"
-				value      	107)
-			    (object Attribute
-				tool       	"COM"
-				name       	"max"
-				value      	108)
-			    (object Attribute
-				tool       	"COM"
-				name       	"(none)"
-				value      	109)))
-		    (object Attribute
-			tool       	"COM"
-			name       	"kind"
-			value      	("TypeKinds" 105))
-		    (object Attribute
-			tool       	"COM"
-			name       	"uuid"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"version"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpstring"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpcontext"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"dllname"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"alias"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"Generate"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpstring"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"COM"
-			name       	"id"
-			value      	"")))
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"filename"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"library"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"imports"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"uuid"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"version"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpstring"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpfile"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpcontext"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"lcid"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"Generate"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"COM"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Version Control"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Data Access"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"Data Access"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Access"
-			name       	"project"
-			value      	" ")))
-	    (object Attribute
-		tool       	"Data Access"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"RequisitePro"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"cg"
-		name       	"compiler2.1__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowGenerateOverNewerAnnotations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowGenerateOverNewerVersion"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileExtension"
-			value      	"h")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileBackupExtension"
-			value      	"h~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileTemporaryExtension"
-			value      	"h#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileExtension"
-			value      	"cpp")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileBackupExtension"
-			value      	"cp~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileTemporaryExtension"
-			value      	"cp#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"$ROSECPP_SOURCE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BooleanType"
-			value      	"int")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowTemplates"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExplicitInstantiations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowProtectedInheritance"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByValueContainer"
-			value      	"$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByValueContainer"
-			value      	"OptionalByValue(sizeof($targetClass))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByValueContainer"
-			value      	"BoundedListByValue(sizeof($targetClass),$limit)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByValueContainer"
-			value      	"BoundedSetByValue(sizeof($targetClass),$limit)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByReferenceContainer"
-			value      	"BoundedListByReference($limit)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByReferenceContainer"
-			value      	"BoundedSetByReference($limit)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByValueContainer"
-			value      	"UnboundedListByValue(sizeof($targetClass))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByValueContainer"
-			value      	"UnboundedSetByValue(sizeof($targetClass))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByReferenceContainer"
-			value      	"UnboundedListByReference")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByReferenceContainer"
-			value      	"UnboundedSetByReference")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByValueContainer"
-			value      	"AssociationByValue(sizeof($qualtype), sizeof($qualcont))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByValueContainer"
-			value      	"DictionaryByValue(sizeof($qualtype), sizeof($qualcont))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByReferenceContainer"
-			value      	"AssociationByReference(sizeof($qualtype), sizeof($qualcont))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByReferenceContainer"
-			value      	"DictionaryByReference(sizeof($qualtype), sizeof($qualcont))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"PathSeparator"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileNameFormat"
-			value      	"128vx_b")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AlwaysKeepOrphanedCode"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"UseMSVC"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CommentWidth"
-			value      	60)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"compiler3.0__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowGenerateOverNewerAnnotations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowGenerateOverNewerVersion"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileExtension"
-			value      	"h")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileBackupExtension"
-			value      	"h~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileTemporaryExtension"
-			value      	"h#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileExtension"
-			value      	"cpp")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileBackupExtension"
-			value      	"cp~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileTemporaryExtension"
-			value      	"cp#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"$ROSECPP_SOURCE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BooleanType"
-			value      	"int")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowTemplates"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExplicitInstantiations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowProtectedInheritance"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByValueContainer"
-			value      	"$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByValueContainer"
-			value      	"OptionalByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByValueContainer"
-			value      	"BoundedListByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByValueContainer"
-			value      	"BoundedSetByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByReferenceContainer"
-			value      	"BoundedListByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByReferenceContainer"
-			value      	"BoundedSetByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByValueContainer"
-			value      	"UnboundedListByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByValueContainer"
-			value      	"UnboundedSetByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByReferenceContainer"
-			value      	"UnboundedListByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByReferenceContainer"
-			value      	"UnboundedSetByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByValueContainer"
-			value      	"AssociationByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByValueContainer"
-			value      	"DictionaryByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByReferenceContainer"
-			value      	"AssociationByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByReferenceContainer"
-			value      	"DictionaryByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"PathSeparator"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileNameFormat"
-			value      	"128vx_b")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AlwaysKeepOrphanedCode"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"UseMSVC"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CommentWidth"
-			value      	60)))
-	    (object Attribute
-		tool       	"Rose Model Integrator"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ByVal"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ByRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Optional"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ParamArray"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"COM"
-			name       	"id"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpstring"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")))
-	    (object Attribute
-		tool       	"VC++"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"VC++"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"VC++"
-			name       	"UpdateATL"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"SmartPointersOnAssoc"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"GenerateImports"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"PutImportsIn"
-			value      	"stdafx.h")
-		    (object Attribute
-			tool       	"VC++"
-			name       	"FullPathInImports"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"UseImportAttributes"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"ImportAttributes"
-			value      	"no_namespace named_guids")
-		    (object Attribute
-			tool       	"VC++"
-			name       	"ImportProjTypeLib"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"DefaultTypeLib"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"TypeLibLocation"
-			value      	"")
-		    (object Attribute
-			tool       	"VC++"
-			name       	"CompileProjTypeLib"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"RvcPtyVersion"
-			value      	"1.0")
-		    (object Attribute
-			tool       	"VC++"
-			name       	"ModelIDStyle"
-			value      	2)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"DocStyle"
-			value      	1)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"GenerateIncludes"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"ApplyPattern"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"CreateBackupFiles"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"SupportCodeName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"DocRevEngineer"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"CreateOverviewDiagrams"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"UpdateModelIDsInCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"AttributeTypes"
-			value      	(value Text 
-|attr1=bool
-|attr2=short
-|attr3=int
-|attr4=long
-|attr5=char
-|attr6=float
-|attr7=double
-|attr8=void
-|attr9=clock_t
-|attr10=_complex
-|attr11=_dev_t
-|attr12=div_t
-|attr13=_exception
-|attr14=FILE
-|attr15=_finddata_t
-|attr16=_FPIEEE_RECORD
-|attr17=fpos_t
-|attr18=_HEAPINFO
-|attr19=jmp_buf
-|attr20=lconv
-|attr21=ldiv_t
-|attr22=_off_t
-|attr23=_onexit_t
-|attr24=_PNH
-|attr25=ptrdiff_t
-|attr26=sig_atomic_t
-|attr27=size_t
-|attr28=_stat
-|attr29=time_t
-|attr30=_timeb
-|attr31=tm
-|attr32=_utimbuf
-|attr33=va_list
-|attr34=wchar_t
-|attr35=wctrans_t
-|attr36=wctype_t
-|attr37=_wfinddata_t
-|attr38=_wfinddatai64_t
-|attr39=wint_t
-|attr40=ABORTPROC
-|attr41=ACMDRIVERENUMCB
-|attr42=ACMDRIVERPROC
-|attr43=ACMFILTERCHOOSEHOOKPROC
-|attr44=ACMFILTERENUMCB
-|attr45=ACMFILTERTAGENUMCB
-|attr46=ACMFORMATCHOOSEHOOKPROC
-|attr47=ACMFORMATENUMCB
-|attr48=ACMFORMATTAGENUMCB
-|attr49=APPLET_PROC
-|attr50=ATOM
-|attr51=BOOL
-|attr52=BOOLEAN
-|attr53=BYTE
-|attr54=CALINFO_ENUMPROC
-|attr55=CALLBACK
-|attr56=CHAR
-|attr57=COLORREF
-|attr58=CONST
-|attr59=CRITICAL_SECTION
-|attr60=CTRYID
-|attr61=DATEFMT_ENUMPROC
-|attr62=DESKTOPENUMPROC
-|attr63=DLGPROC
-|attr64=DRAWSTATEPROC
-|attr65=DWORD
-|attr66=EDITWORDBREAKPROC
-|attr67=ENHMFENUMPROC
-|attr68=ENUMRESLANGPROC
-|attr69=ENUMRESNAMEPROC
-|attr70=ENUMRESTYPEPROC
-|attr71=FARPROC
-|attr72=FILE_SEGMENT_ELEMENT
-|attr73=FLOAT
-|attr74=FONTENUMPROC
-|attr75=GOBJENUMPROC
-|attr76=GRAYSTRINGPROC
-|attr77=HACCEL
-|attr78=HANDLE
-|attr79=HBITMAP
-|attr80=HBRUSH
-|attr81=HCOLORSPACE
-|attr82=HCONV
-|attr83=HCONVLIST
-|attr84=HCURSOR
-|attr85=HDC
-|attr86=HDDEDATA
-|attr87=HDESK
-|attr88=HDROP
-|attr89=HDWP
-|attr90=HENHMETAFILE
-|attr91=HFILE
-|attr92=HFONT
-|attr93=HGDIOBJ
-|attr94=HGLOBAL
-|attr95=HHOOK
-|attr96=HICON
-|attr97=HIMAGELIST
-|attr98=HIMC
-|attr99=HINSTANCE
-|attr100=HKEY
-|attr101=HKL
-|attr102=HLOCAL
-|attr103=HMENU
-|attr104=HMETAFILE
-|attr105=HMODULE
-|attr106=HMONITOR
-|attr107=HOOKPROC
-|attr108=HPALETTE
-|attr109=HPEN
-|attr110=HRGN
-|attr111=HRSRC
-|attr112=HSZ
-|attr113=HTREEITEM
-|attr114=HWINSTA
-|attr115=HWND
-|attr116=INT
-|attr117=IPADDR
-|attr118=LANGID
-|attr119=LCID
-|attr120=LCSCSTYPE
-|attr121=LCSGAMUTMATCH
-|attr122=LCTYPE
-|attr123=LINEDDAPROC
-|attr124=LOCALE_ENUMPROC
-|attr125=LONG
-|attr126=LONGLONG
-|attr127=LPARAM
-|attr128=LPBOOL
-|attr129=LPBYTE
-|attr130=LPCCHOOKPROC
-|attr131=LPCFHOOKPROC
-|attr132=LPCOLORREF
-|attr133=LPCRITICAL_SECTION
-|attr134=LPCSTR
-|attr135=LPCTSTR
-|attr136=LPCVOID
-|attr137=LPCWSTR
-|attr138=LPDWORD
-|attr139=LPFIBER_START_ROUTINE
-|attr140=LPFRHOOKPROC
-|attr141=LPHANDLE
-|attr142=LPHANDLER_FUNCTION
-|attr143=LPINT
-|attr144=LPLONG
-|attr145=LPOFNHOOKPROC
-|attr146=LPPAGEPAINTHOOK
-|attr147=LPPAGESETUPHOOK
-|attr148=LPPRINTHOOKPROC
-|attr149=LPPROGRESS_ROUTINE
-|attr150=LPSETUPHOOKPROC
-|attr151=LPSTR
-|attr152=LPSTREAM
-|attr153=LPTHREAD_START_ROUTINE
-|attr154=LPTSTR
-|attr155=LPVOID
-|attr156=LPWORD
-|attr157=LPWSTR
-|attr158=LRESULT
-|attr159=LUID
-|attr160=PBOOL
-|attr161=PBOOLEAN
-|attr162=PBYTE
-|attr163=PCHAR
-|attr164=PCRITICAL_SECTION
-|attr165=PCSTR
-|attr166=PCTSTR
-|attr167=PCWCH
-|attr168=PCWSTR
-|attr169=PDWORD
-|attr170=PFLOAT
-|attr171=PFNCALLBACK
-|attr172=PHANDLE
-|attr173=PHANDLER_ROUTINE
-|attr174=PHKEY
-|attr175=PINT
-|attr176=PLCID
-|attr177=PLONG
-|attr178=PLUID
-|attr179=PROPENUMPROC
-|attr180=PROPENUMPROCEX
-|attr181=PSHORT
-|attr182=PSTR
-|attr183=PTBYTE
-|attr184=PTCHAR
-|attr185=PTIMERAPCROUTINE
-|attr186=PTSTR
-|attr187=PUCHAR
-|attr188=PUINT
-|attr189=PULONG
-|attr190=PUSHORT
-|attr191=PVOID
-|attr192=PWCHAR
-|attr193=PWORD
-|attr194=PWSTR
-|attr195=REGISTERWORDENUMPROC
-|attr196=REGSAM
-|attr197=SC_HANDLE
-|attr198=SC_LOCK
-|attr199=SENDASYNCPROC
-|attr200=SERVICE_STATUS_HANDLE
-|attr201=SHORT
-|attr202=TBYTE
-|attr203=TCHAR
-|attr204=TIMEFMT_ENUMPROC
-|attr205=TIMERPROC
-|attr206=UCHAR
-|attr207=UINT
-|attr208=ULONG
-|attr209=ULONGLONG
-|attr210=UNSIGNED
-|attr211=USHORT
-|attr212=VOID
-|attr213=WCHAR
-|attr214=WINAPI
-|attr215=WINSTAENUMPROC
-|attr216=WNDENUMPROC
-|attr217=WNDPROC
-|attr218=WORD
-|attr219=WPARAM
-|attr220=YIELDPROC
-|attr221=CPoint
-|attr222=CRect
-|attr223=CSize
-|attr224=CString
-|attr225=CTime
-|attr226=CTimeSpan
-|attr227=CCreateContext
-|attr228=CMemoryState
-|attr229=COleSafeArray
-|attr230=CPrintInfo
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Containers"
-			value      	(value Text 
-|cont1=CArray<$TYPE, $TYPE&>
-|cont2=CByteArray
-|cont3=CDWordArray
-|cont4=CObArray
-|cont5=CPtrArray
-|cont6=CStringArray
-|cont7=CUIntArray
-|cont8=CWordArray
-|cont9=CList<$TYPE, $TYPE&>
-|cont10=CPtrList
-|cont11=CObList
-|cont12=CStringList
-|cont13=CMapWordToPtr
-|cont14=CMapPtrToWord
-|cont15=CMapPtrToPtr
-|cont16=CMapWordToOb
-|cont17=CMapStringToPtr
-|cont18=CMapStringToOb
-|cont19=CMapStringToString
-|cont20=CTypedPtrArray<CPtrArray, $TYPE*>
-|cont21=CTypedPtrArray<CObArray, $TYPE*>
-|cont22=CTypedPtrList<CObList, $TYPE*>
-|cont23=CTypedPtrList<CPtrList, $TYPE*>
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"ClassMethods"
-			value      	(value Text 
-|*_body=// ToDo: Add your specialized code here and/or call the base class
-|cm1=$NAME()
-|cm2=$NAME(orig:const $NAME&)
-|cm3=<<virtual>> ~$NAME()
-|cm4=operator=(rhs:$NAME&):$NAME&
-|cm4_body=// ToDo: Add your specialized code here and/or call the base class||return rhs;
-|cm5=<<const>> operator==(rhs:const $NAME&):bool
-|cm5_body=// ToDo: Add your specialized code here and/or call the base class||return false;
-|cm6=<<const>> operator!=(rhs:$NAME&):bool
-|cm6_body=// ToDo: Add your specialized code here and/or call the base class||return false;
-|cm7=<<const>> operator<(rhs:$NAME&):bool
-|cm7_body=// ToDo: Add your specialized code here and/or call the base class||return false;
-|cm8=<<const>> operator>(rhs:$NAME&):bool
-|cm8_body=// ToDo: Add your specialized code here and/or call the base class||return false;
-|cm9=<<const>> operator<=(rhs:$NAME&):bool
-|cm9_body=// ToDo: Add your specialized code here and/or call the base class||return false;
-|cm10=<<const>> operator>=(rhs:$NAME&):bool
-|cm10_body=// ToDo: Add your specialized code here and/or call the base class||return false;
-|cm11=<<friend>> operator>>(i:istream&, rhs:$NAME&):istream&
-|cm11_body=// ToDo: Add your specialized code here and/or call the base class||return i;
-|cm12=<<friend>> operator<<(o:ostream&, rhs:const $NAME&):ostream&
-|cm12_body=// ToDo: Add your specialized code here and/or call the base class||return o;
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Accessors"
-			value      	(value Text 
-|agf=<<const>> get_$BASICNAME():const $TYPE
-|agf_body=return $NAME;
-|asf=set_$BASICNAME(value:$TYPE):void
-|asf_body=$NAME = value;|return;
-|agv=<<const>> get_$BASICNAME():const $TYPE&
-|agv_body=return $NAME;
-|asv=set_$BASICNAME(value:$TYPE&):void
-|asv_body=$NAME = value;|return;
-|agp=<<const>> get_$BASICNAME():const $TYPE
-|agp_body=return $NAME;
-|asp=set_$BASICNAME(value:$TYPE):void
-|asp_body=$NAME = value;|return;
-|agr=<<const>> get_$BASICNAME():const $TYPE
-|agr_body=return $NAME;
-|asr=set_$BASICNAME(value:$TYPE):void
-|asr_body=$NAME = value;|return;
-|aga=<<const>> get_$BASICNAME(index:int):const $TYPE
-|aga_body=return $NAME[index];
-|asa=set_$BASICNAME(index:int, value:$TYPE):void
-|asa_body=$NAME[index] = value;|return;
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Conditionals"
-			value      	(value Text 
-|*_decl=#ifdef _DEBUG
-|*_base=CObject
-|cond1=<<virtual, const>> AssertValid():void
-|cond1_body=$SUPERNAME::AssertValid();
-|cond2=<<virtual, const>> Dump(dc:CDumpContext&):void
-|cond2_body=$SUPERNAME::Dump(dc);
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Patterns"
-			value      	(value Text 
-|patrn1=cm1,cm3,cond1,cond2
-|Patrn1_name=Default
-			))))
-	    (object Attribute
-		tool       	"VC++"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Generate"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"VC++"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"VC++"
-			name       	"InternalMap"
-			value      	(value Text 
-|*:AUTO:AUTO
-|
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"ExportMap"
-			value      	(value Text 
-|*:AUTO:AUTO
-|
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"InitialSourceIncludes"
-			value      	(value Text 
-|"stdafx.h"
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"InitialHeaderIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Copyright"
-			value      	(value Text "Copyright (C) 1991 - 1999 Rational Software Corporation"))))
-	    (object Attribute
-		tool       	"VC++"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Const"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"InitialValue"
-			value      	"")))
-	    (object Attribute
-		tool       	"VC++"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Generate"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"VC++"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"DefaultBody"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"VC++"
-		name       	"HiddenTool"
-		value      	FALSE))
-	quid       	"34DBB4830145"))
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/analysis/DAYLIGHT SAVINGS ANALYSIS.md~
--- a/tzservices/tzserver/analysis/DAYLIGHT SAVINGS ANALYSIS.md~	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6210 +0,0 @@
-
-(object Petal
-    version    	43
-    _written   	"Rose 6.5.9232.10"
-    charSet    	0)
-
-(object Design "Logical View"
-    is_unit    	TRUE
-    is_loaded  	TRUE
-    quid       	"36D487460258"
-    defaults   	(object defaults
-	rightMargin 	0.250000
-	leftMargin 	0.250000
-	topMargin  	0.250000
-	bottomMargin 	0.500000
-	pageOverlap 	0.250000
-	clipIconLabels 	TRUE
-	autoResize 	TRUE
-	snapToGrid 	TRUE
-	gridX      	16
-	gridY      	16
-	defaultFont 	(object Font
-	    size       	9
-	    face       	"Arial"
-	    bold       	FALSE
-	    italics    	FALSE
-	    underline  	FALSE
-	    strike     	FALSE
-	    color      	0
-	    default_color 	TRUE)
-	showMessageNum 	1
-	showClassOfObject 	TRUE
-	notation   	"Unified")
-    root_usecase_package 	(object Class_Category "Use Case View"
-	quid       	"34DBB4830142"
-	documentation 	
-|The Use Case View organizes the Use-Case Model and the optional Business Use-Case Model.
-|
-	
-	exportControl 	"Public"
-	global     	TRUE
-	logical_models 	(list unit_reference_list
-	    (object Class_Category "Business Use-Case Model"
-		quid       	"35B677D701B8"
-		documentation 	
-|Optional Model:
-|The business modeling workflow in Rational Unified Process produces two models: the business use-case model, and the business object model. Both show the business 
-|processes, but different aspects of them. In the business use-case model each business use case represents a business process, described (text and/or activity diagrams) from an "external" view point without worrying about who does what to whom inside of the organization. 
-|In the business object model, you include realizations of each business use case to show how workers and entities collaborate to perform the process. You do that using class diagrams, activity diagrams with swimlanes, collaboration diagrams, and/or interaction diagrams.
-|
-|<Any additional description of the Business Use Case Model, such as modeling conventions that the reader/reviewer may need to understand the model, should be described here.>
-		
-		exportControl 	"Public"
-		logical_models 	(list unit_reference_list)
-		logical_presentations 	(list unit_reference_list
-		    (object UseCaseDiagram "Global View of Business Actors and Business Use Cases"
-			quid       	"35C0DFF50172"
-			title      	"Global View of Business Actors and Business Use Cases"
-			documentation 	"This is a global view of the system showing all Busines Use Cases and Business Actors.  It is intended to be an overview diagram, so if the diagram becomes too complex for easy comprehension, use several diagrams, each of which should focus on a different aspect of the system.  Usually, organizing use case diagrams around actors is a good approach."
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object NoteView @1
-				location   	(464, 352)
-				label      	(object ItemLabel
-				    Parent_View 	@1
-				    location   	(42, 11)
-				    fill_color 	13434879
-				    nlines     	14
-				    max_width  	809
-				    label      	
-|Global View of Business Actors and BusinessUse Cases
-|
-|This diagram presents all Business Actors and all concrete Business Use Cases (those that are directly instantiable).
-|
-|Related Rational Unified Process Activities:
-|- Activity: Find Business Actors and Use Cases
-|- Activity: Structure the Business Use Case Model
-|
-|*Note: this note may be deleted once the diagram is created.
-				    )
-				line_color 	3342489
-				fill_color 	13434879
-				width      	869
-				height     	694)
-			    (object NoteView @2
-				location   	(1280, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@2
-				    location   	(942, 29)
-				    fill_color 	13434879
-				    nlines     	5
-				    max_width  	640
-				    label      	
-|Created/modified by: <name>
-|Date: <creation/modification date>
-|
-|Approved by: <name>
-|Date: <approval date>
-				    )
-				line_color 	3342489
-				fill_color 	13434879
-				width      	700
-				height     	275)))))
-	    (object Class_Category "Use-Case Model"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"M:\\DST\\analysis\\UseCases.cat"
-		quid       	"35B677F4010E"))
-	logical_presentations 	(list unit_reference_list
-	    (object UseCaseDiagram "Main"
-		quid       	"35C6339B029F"
-		title      	"Main"
-		documentation 	
-|This diagram depicts the relationships between the packages (models) contained in the 'Use-Case View": the Use-Case Model (for the system) and the Business Use-Case Model (describing the business).
-		
-		zoom       	90
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list
-		    (object CategoryView "Use Case View::Use-Case Model" @3
-			location   	(400, 864)
-			font       	(object Font
-			    size       	10)
-			label      	(object ItemLabel
-			    Parent_View 	@3
-			    location   	(256, 780)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"Use-Case Model")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"35B677F4010E"
-			width      	300
-			height     	180)
-		    (object NoteView @4
-			location   	(1168, 592)
-			font       	(object Font
-			    size       	10)
-			label      	(object ItemLabel
-			    Parent_View 	@4
-			    location   	(941, 390)
-			    fill_color 	13434879
-			    nlines     	9
-			    max_width  	419
-			    label      	"The Use-Case Model is traceable to (and derives from) the Business Model.  The system (as described in the Use Case Model) provides behavior that supports the business.")
-			line_color 	3342489
-			fill_color 	13434879
-			width      	479
-			height     	416)
-		    (object CategoryView "Use Case View::Business Use-Case Model" @5
-			location   	(384, 320)
-			label      	(object ItemLabel
-			    Parent_View 	@5
-			    location   	(189, 229)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	390
-			    justify    	0
-			    label      	"Business Use-Case Model")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"35B677D701B8"
-			width      	403
-			height     	194)
-		    (object ImportView "" @6
-			stereotype 	TRUE
-			line_color 	3342489
-			quidu      	"35C633DA030C"
-			client     	@3
-			supplier   	@5
-			line_style 	0)
-		    (object AttachView "" @7
-			stereotype 	TRUE
-			line_color 	3342489
-			client     	@6
-			supplier   	@4
-			line_style 	0)))))
-    root_category 	(object Class_Category "Logical View"
-	quid       	"34DBB4830141"
-	documentation 	
-|Rational Unified Process uses the "Logical View in Rose" to organize the Design Model  and the Process View and the optional Business Object Model and Analysis Model.
-	
-	exportControl 	"Public"
-	global     	TRUE
-	subsystem  	"Component View"
-	quidu      	"34DBB4830143"
-	logical_models 	(list unit_reference_list
-	    (object Class_Category "Analysis Model"
-		quid       	"35B678170028"
-		documentation 	
-|This model is optional.
-|The Analysis Model contains a set of Analysis Classes, which describe an abstract realization of the use cases of the system.  The analysis classes evolve into associated design elements which are modeled in the Design Model.  
-		
-		exportControl 	"Public"
-		logical_models 	(list unit_reference_list
-		    (object Class_Category "Business Object Model"
-			is_unit    	TRUE
-			is_loaded  	FALSE
-			file_name  	"M:\\DST\\analysis\\LogicalBusinessObjects.cat"
-			quid       	"35B678080064")
-		    (object Class_Category "TZ Compiler"
-			is_unit    	TRUE
-			is_loaded  	FALSE
-			file_name  	"M:\\DST\\analysis\\TZCOMPILER.CAT"
-			quid       	"40E569BC024F")
-		    (object Class_Category "LTClasses"
-			is_unit    	TRUE
-			is_loaded  	FALSE
-			file_name  	"M:\\DST\\analysis\\Classes.cat"
-			quid       	"40A89DC203B0")
-		    (object Class_Category "Time Zone Database Management"
-			is_unit    	TRUE
-			is_loaded  	FALSE
-			file_name  	"M:\\DST\\analysis\\LogicalTZDBM.cat"
-			quid       	"40B1E4A6003A")
-		    (object Class_Category "Local Time Conversion"
-			is_unit    	TRUE
-			is_loaded  	FALSE
-			file_name  	"M:\\DST\\analysis\\LogicalLocaltimeConv.cat"
-			quid       	"40B1D43200B7")
-		    (object Class_Category "System Time Management"
-			is_unit    	TRUE
-			is_loaded  	FALSE
-			file_name  	"M:\\DST\\analysis\\LogicalSysTimeMngmt.cat"
-			quid       	"40B1D49203C5")
-		    (object Class_Category "TZClasses"
-			is_unit    	TRUE
-			is_loaded  	FALSE
-			file_name  	"M:\\DST\\analysis\\TZClasses.cat"
-			quid       	"40F3CEAF0324")
-		    (object Class_Category "BClasses"
-			is_unit    	TRUE
-			is_loaded  	FALSE
-			file_name  	"M:\\DST\\analysis\\BClasses.cat"
-			quid       	"40F3CFB10172"))
-		logical_presentations 	(list unit_reference_list))
-	    (object Class_Category "Design Model"
-		quid       	"35B6782302DA"
-		documentation 	
-|The Design Model in Rational Unified Process.
-|The design model is adapted to model the real implementation environment, and serves as an abstraction of the source code. It is a "blueprint" of how the source code is structured and written. 
-|
-|The design model is a hierarchy of packages (design subsystems and design-service  packages), with "leaves" that are classes. Subsystems are a design "view" of the components that are defined in the Implementation Model.
-|
-|The design model hierarchy consists of layers. 
-|
-|Classes represent abstractions of classes in the system's implementation. They define the objects, which in turn are abstractions of the objects in the system's implementation. The use cases are realized by the objects, and this is represented by use-case realizations in the Design Model.  Each use-case realization has a realize dependency to a use case in the Use-Case Model. 
-		
-		exportControl 	"Public"
-		logical_models 	(list unit_reference_list
-		    (object Class_Category "<Layer Name> Layer"
-			quid       	"34E3686A00F0"
-			documentation 	
-|The design model is normally organized in layers. The number of layers is not fixed, but varies from situation to situation. 
-|
-|During architectural analysis, focus is normally on the two high-level layers, that is, the application and business-specific layers;  this is what is meant by the "high-level organization of subsystems." The other lower-level layers are in focus during architectural design, refer to the activity Architectural Design for more information.
-|
-|Layers are identified using the naming conventions shown in the name of this package. 
-			
-			exportControl 	"Public"
-			logical_models 	(list unit_reference_list
-			    (object Class_Category "<package name>"
-				quid       	"34E36BB7017C"
-				documentation 	
-|<Enter a short description of the package here.  A package should be used in cases where a set of classes and/or other packages need to be grouped together for model organization purposes.  Though the contents of the package can have public visibility, which makes them visible to model elements outside the containing package, packages are primarily just grouping mechanisms.  
-|
-|If a set of classes is to be encapsulated and can be hidden behind a well-defined interface, a subsystem is a more appropriate container>
-				
-				exportControl 	"Public"
-				logical_models 	(list unit_reference_list)
-				logical_presentations 	(list unit_reference_list
-				    (object ClassDiagram "<package name> - Dependencies"
-					quid       	"37BC2256004D"
-					title      	"<package name> - Dependencies"
-					documentation 	"This diagram shows the package itself and the packages that it is dependent of. That is useful to know for instance when the package is a separate unit that can be reused in other systems."
-					zoom       	100
-					max_height 	28350
-					max_width  	21600
-					origin_x   	0
-					origin_y   	0
-					items      	(list diagram_item_list))
-				    (object ClassDiagram "<package name> - Interfaces"
-					quid       	"37BC226D026D"
-					title      	"<package name> - Interfaces"
-					documentation 	"This diagram shows only the classes that are visible outside this package. The interfaces of the package."
-					zoom       	100
-					max_height 	28350
-					max_width  	21600
-					origin_x   	0
-					origin_y   	0
-					items      	(list diagram_item_list))))
-			    (object Class_Category "<Subsystem Name>"
-				quid       	"35C0F38200B4"
-				documentation 	
-|<Enter a short description of the subsystem here.  A subsystem should be used in cases where a set of classes and/or other packages need to be encapsulated within a container and hidden behind a set of well-defined interfaces.  By convention, none of the contents of subsystem are visible except the interfaces of the subsystem.  This allows subsystems to be easily replaced, and the implementations changed, provided the interfaces remain unchanged.  It offers a degree of encapsulation greater than that of the package.
-|
-|If a set of classes is merely to be grouped together, but public visibility of classes is still desirable, a package is a more appropriate container.>
-				
-				stereotype 	"subsystem"
-				exportControl 	"Public"
-				logical_models 	(list unit_reference_list)
-				logical_presentations 	(list unit_reference_list
-				    (object ClassDiagram "<subsystem name> - Dependencies"
-					quid       	"35C0F4220190"
-					title      	"<subsystem name> - Dependencies"
-					documentation 	"This diagram shows the package itself and the packages that it is dependent of. That is useful to know for instance when the package is a separate unit that can be reused in other systems."
-					zoom       	100
-					max_height 	28350
-					max_width  	21600
-					origin_x   	0
-					origin_y   	0
-					items      	(list diagram_item_list))
-				    (object ClassDiagram "<subsystem name> - Interfaces"
-					quid       	"37BC21080165"
-					title      	"<subsystem name> - Interfaces"
-					documentation 	
-|The Process View in Rational Unified Process
-|This package is used to organize the active classes in the system and will be presented in the SoDA-generated Software Architecture Document, under the "Process View"
-					
-					zoom       	100
-					max_height 	28350
-					max_width  	21600
-					origin_x   	0
-					origin_y   	0
-					items      	(list diagram_item_list)))))
-			logical_presentations 	(list unit_reference_list
-			    (object ClassDiagram "All Packages in <Layer Name> - Layer"
-				quid       	"34E36C2903C0"
-				title      	"All Packages in <Layer Name> - Layer"
-				documentation 	"This diagram shows all packages in this - Layer."
-				zoom       	100
-				max_height 	28350
-				max_width  	21600
-				origin_x   	0
-				origin_y   	0
-				items      	(list diagram_item_list))))
-		    (object Class_Category "Use-Case Realizations"
-			quid       	"34E36D3203CA"
-			documentation 	
-|In this Package we will describe "Use Case Realizations" as stereotyped use cases.
-|
-|A use-case realization describes how a particular use case is realized within  the design model, in terms of collaborating objects.
-|
-|A realize dependency is used between the "Use Case Realization" and the "Use Case" in the use-case  model that is realized. 
-|
-|
-			
-			exportControl 	"Public"
-			logical_models 	(list unit_reference_list
-			    (object Association "$UNNAMED$0"
-				quid       	"35409E9D02A8"
-				stereotype 	"realize"
-				roles      	(list role_list
-				    (object Role "$UNNAMED$1"
-					quid       	"35409E9E0294"
-					supplier   	"Use Case View::Use-Case Model::Use Cases::<Use Case Name>::<Use Case Name>"
-					quidu      	"34E37FB203D4"
-					is_navigable 	TRUE)
-				    (object Role "$UNNAMED$2"
-					quid       	"35409E9E0295"
-					supplier   	"Logical View::Design Model::Use-Case Realizations::<Use-Case Name>::<Use-Case Name>"
-					quidu      	"352F38180276")))
-			    (object Class_Category "<Use-Case Name>"
-				quid       	"35D083E100BE"
-				documentation 	" A separate package is recommended for each Use Case Realization to facilitate access and version control of related use case artifacts."
-				exportControl 	"Public"
-				logical_models 	(list unit_reference_list
-				    (object UseCase "<Use-Case Name>"
-					attributes 	(list Attribute_Set
-					    (object Attribute
-						tool       	"RequisitePro"
-						name       	"ReqProProjectPath"
-						value      	"")
-					    (object Attribute
-						tool       	"RequisitePro"
-						name       	"ReqProProjectGuid"
-						value      	"")
-					    (object Attribute
-						tool       	"RequisitePro"
-						name       	"ReqProDocumentName"
-						value      	"")
-					    (object Attribute
-						tool       	"RequisitePro"
-						name       	"ReqProDocumentGuid"
-						value      	"")
-					    (object Attribute
-						tool       	"RequisitePro"
-						name       	"ReqProDocType"
-						value      	"")
-					    (object Attribute
-						tool       	"RequisitePro"
-						name       	"ReqProReqType"
-						value      	"")
-					    (object Attribute
-						tool       	"RequisitePro"
-						name       	"ReqProRequirementId"
-						value      	""))
-					quid       	"352F38180276"
-					documentation 	
-|This will be a stereotype on a usecase. 
-|In UML it is a stereotype on a collaboration and that does not exist in Rose.
-					
-					stereotype 	"use-case realization"
-					logical_models 	(list unit_reference_list
-					    (object Mechanism @8
-						logical_models 	(list unit_reference_list))
-					    (object Mechanism @9
-						logical_models 	(list unit_reference_list)))
-					logical_presentations 	(list unit_reference_list
-					    (object ClassDiagram "<Use Case Name> -  Realize Dependencies"
-						quid       	"37BC23B801F1"
-						title      	"<Use Case Name> -  Realize Dependencies"
-						documentation 	"This diagram shows the Use Case and the Use Case Realization and the realize dependency between them.  This information is used to connect the use case with the use case realization."
-						zoom       	100
-						max_height 	28350
-						max_width  	21600
-						origin_x   	0
-						origin_y   	0
-						items      	(list diagram_item_list))
-					    (object ClassDiagram "<Use Case Name> -  Participating Classes"
-						quid       	"37BC23E0036B"
-						title      	"<Use Case Name> -  Participating Classes"
-						documentation 	"This Diagram shows all participating classes in this Use Case Realization"
-						zoom       	100
-						max_height 	28350
-						max_width  	21600
-						origin_x   	0
-						origin_y   	0
-						items      	(list diagram_item_list))
-					    (object InteractionDiagram "<Use Case Name> -  Basic Flow"
-						mechanism_ref 	@8
-						quid       	"35081E3603A2"
-						title      	"<Use Case Name> -  Basic Flow"
-						zoom       	100
-						max_height 	28350
-						max_width  	21600
-						origin_x   	0
-						origin_y   	0
-						items      	(list diagram_item_list))
-					    (object InteractionDiagram "<Use Case Name> -  <Flow Type>"
-						mechanism_ref 	@9
-						quid       	"3540A0B901AE"
-						title      	"<Use Case Name> -  <Flow Type>"
-						zoom       	100
-						max_height 	28350
-						max_width  	21600
-						origin_x   	0
-						origin_y   	0
-						items      	(list diagram_item_list)))))
-				logical_presentations 	(list unit_reference_list
-				    (object ClassDiagram "Realize Dependency"
-					quid       	"34E39DA90302"
-					title      	"Realize Dependency"
-					documentation 	"This diagram shows the Use Case and the Use Case Realization and the realizes dependency between them."
-					zoom       	100
-					max_height 	28350
-					max_width  	21600
-					origin_x   	0
-					origin_y   	0
-					items      	(list diagram_item_list
-					    (object NoteView @10
-						location   	(704, 144)
-						label      	(object ItemLabel
-						    Parent_View 	@10
-						    location   	(38, 25)
-						    fill_color 	13434879
-						    nlines     	5
-						    max_width  	1296
-						    label      	
-|
-|This diagram shows the Use Case and the Use Case Realization and the realize dependency between them.
-						    )
-						line_color 	3342489
-						fill_color 	13434879
-						width      	1356
-						height     	250)
-					    (object UseCaseView "Use Case View::Use-Case Model::Use Cases::<Use Case Name>::<Use Case Name>" @11
-						location   	(1152, 528)
-						label      	(object ItemLabel
-						    Parent_View 	@11
-						    location   	(1152, 666)
-						    anchor_loc 	1
-						    nlines     	2
-						    max_width  	631
-						    justify    	0
-						    label      	"<Use Case Name>")
-						icon_style 	"Icon"
-						line_color 	3342489
-						fill_color 	13434879
-						quidu      	"34E37FB203D4"
-						autoResize 	TRUE)
-					    (object UseCaseView "Logical View::Design Model::Use-Case Realizations::<Use-Case Name>::<Use-Case Name>" @12
-						location   	(608, 960)
-						label      	(object ItemLabel
-						    Parent_View 	@12
-						    location   	(608, 1148)
-						    anchor_loc 	1
-						    nlines     	2
-						    max_width  	651
-						    justify    	0
-						    label      	"<Use-Case Name>")
-						stereotype 	(object ItemLabel
-						    Parent_View 	@12
-						    location   	(608, 1078)
-						    anchor     	10
-						    anchor_loc 	1
-						    nlines     	1
-						    max_width  	434
-						    justify    	0
-						    label      	"<<use-case realization>>")
-						icon       	"use-case realization"
-						icon_style 	"Icon"
-						line_color 	3342489
-						fill_color 	13434879
-						quidu      	"352F38180276"
-						autoResize 	TRUE)
-					    (object AssociationViewNew "$UNNAMED$0" @13
-						location   	(876, 741)
-						stereotype 	(object SegLabel @14
-						    Parent_View 	@13
-						    location   	(874, 746)
-						    anchor     	10
-						    anchor_loc 	1
-						    nlines     	1
-						    max_width  	450
-						    justify    	0
-						    label      	"<<realize>>"
-						    pctDist    	0.483333
-						    height     	5
-						    orientation 	1)
-						line_color 	3342489
-						quidu      	"35409E9D02A8"
-						roleview_list 	(list RoleViews
-						    (object RoleView "$UNNAMED$1" @15
-							Parent_View 	@13
-							location   	(236, -539)
-							stereotype 	TRUE
-							line_color 	3342489
-							quidu      	"35409E9E0294"
-							client     	@13
-							supplier   	@11
-							line_style 	0)
-						    (object RoleView "$UNNAMED$2" @16
-							Parent_View 	@13
-							location   	(236, -539)
-							stereotype 	TRUE
-							line_color 	3342489
-							quidu      	"35409E9E0295"
-							client     	@13
-							supplier   	@12
-							line_style 	0))))))))
-			logical_presentations 	(list unit_reference_list))
-		    (object Class_Category "Process View"
-			quid       	"35D227B103C0"
-			documentation 	"An architectural view that describes the concurrent aspect of the system: tasks (processes) and their interactions."
-			exportControl 	"Public"
-			logical_models 	(list unit_reference_list
-			    (object Class "<Process Name>"
-				quid       	"35DB3C8302D0"
-				documentation 	"This process provides <enter a description here of what the role of the process in the system is>.  A separate process was chosen for this to be able to <enter the rationale for needing a separate process>."
-				stereotype 	"process")
-			    (object Class "<Thread Name>"
-				quid       	"35DB3CB002BC"
-				documentation 	"This is a sub-process or thread within the <name of process of which this thread is a sub-process> process which handles <enter a description of what this thread does>.  A separate thread was chosen for this to be able to <enter the rationale for creating a separate thread>."
-				stereotype 	"thread")
-			    (object Association "$UNNAMED$3"
-				quid       	"35DB3E72017C"
-				roles      	(list role_list
-				    (object Role "$UNNAMED$4"
-					quid       	"35DB3E73005A"
-					supplier   	"Logical View::Design Model::Process View::<Process Name>"
-					quidu      	"35DB3C8302D0"
-					is_navigable 	TRUE
-					is_aggregate 	TRUE)
-				    (object Role "$UNNAMED$5"
-					quid       	"35DB3E730096"
-					supplier   	"Logical View::Design Model::Process View::<Thread Name>"
-					quidu      	"35DB3CB002BC"
-					Containment 	"By Value"
-					is_navigable 	TRUE))))
-			logical_presentations 	(list unit_reference_list
-			    (object ClassDiagram "Process View"
-				quid       	"35DB3C2A02B2"
-				title      	"Process View"
-				documentation 	"This diagram illustrates the composition of processes and threads, and the mapping of classes onto those processes and threads."
-				zoom       	100
-				max_height 	28350
-				max_width  	21600
-				origin_x   	0
-				origin_y   	0
-				items      	(list diagram_item_list
-				    (object ClassView "Class" "Logical View::Design Model::Process View::<Process Name>" @17
-					ShowCompartmentStereotypes 	TRUE
-					IncludeAttribute 	TRUE
-					IncludeOperation 	TRUE
-					location   	(288, 464)
-					label      	(object ItemLabel
-					    Parent_View 	@17
-					    location   	(122, 436)
-					    fill_color 	13434879
-					    nlines     	1
-					    max_width  	332
-					    justify    	0
-					    label      	"<Process Name>")
-					stereotype 	(object ItemLabel
-					    Parent_View 	@17
-					    location   	(122, 389)
-					    fill_color 	13434879
-					    anchor     	10
-					    nlines     	1
-					    max_width  	332
-					    justify    	0
-					    label      	"<<process>>")
-					icon_style 	"Icon"
-					line_color 	3342489
-					fill_color 	13434879
-					quidu      	"35DB3C8302D0"
-					width      	350
-					height     	172
-					annotation 	8
-					autoResize 	TRUE)
-				    (object ClassView "Class" "Logical View::Design Model::Process View::<Thread Name>" @18
-					ShowCompartmentStereotypes 	TRUE
-					IncludeAttribute 	TRUE
-					IncludeOperation 	TRUE
-					location   	(896, 464)
-					label      	(object ItemLabel
-					    Parent_View 	@18
-					    location   	(740, 436)
-					    fill_color 	13434879
-					    nlines     	1
-					    max_width  	312
-					    justify    	0
-					    label      	"<Thread Name>")
-					stereotype 	(object ItemLabel
-					    Parent_View 	@18
-					    location   	(740, 389)
-					    fill_color 	13434879
-					    anchor     	10
-					    nlines     	1
-					    max_width  	312
-					    justify    	0
-					    label      	"<<thread>>")
-					icon_style 	"Icon"
-					line_color 	3342489
-					fill_color 	13434879
-					quidu      	"35DB3CB002BC"
-					width      	330
-					height     	172
-					annotation 	8
-					autoResize 	TRUE)
-				    (object AssociationViewNew "$UNNAMED$3" @19
-					location   	(596, 464)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"35DB3E72017C"
-					roleview_list 	(list RoleViews
-					    (object RoleView "$UNNAMED$4" @20
-						Parent_View 	@19
-						location   	(-300, 0)
-						stereotype 	TRUE
-						line_color 	3342489
-						quidu      	"35DB3E73005A"
-						client     	@19
-						supplier   	@17
-						line_style 	0)
-					    (object RoleView "$UNNAMED$5" @21
-						Parent_View 	@19
-						location   	(-300, 0)
-						stereotype 	TRUE
-						line_color 	3342489
-						quidu      	"35DB3E730096"
-						client     	@19
-						supplier   	@18
-						line_style 	0))))))))
-		logical_presentations 	(list unit_reference_list
-		    (object ClassDiagram "Architecturally Significant Model Elements"
-			quid       	"34E36BDE02C6"
-			title      	"Architecturally Significant Model Elements"
-			documentation 	"Elements of the Design Model which are considered architecturally significant should be presented in this diagram.  This diagram will be presented in the document generated using the SoDA Software Architecture Document."
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object NoteView @22
-				location   	(672, 304)
-				label      	(object ItemLabel
-				    Parent_View 	@22
-				    location   	(28, 19)
-				    fill_color 	13434879
-				    nlines     	13
-				    max_width  	1253
-				    label      	
-|
-|This diagram is just produced for architectural significant packages.
-|
-|This diagram shows the Architectural Significant Classes and Packages in this package. Only significant  operations and attributes are shown on the classes in this diagram.
-|
-|See Rational Unified Process:
-|Activity: Architectural Design
-|Step:  Include Architecturally Significant Model Elements in the Logical View 
-|
-|This will be a part of  the  "Software Architecture Document" :
-|- "Logical View" 
-|-     "Architecturally Significant Model Elements"
-				    )
-				line_color 	3342489
-				fill_color 	13434879
-				width      	1313
-				height     	582)
-			    (object NoteView @23
-				location   	(1696, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@23
-				    location   	(1358, 29)
-				    fill_color 	13434879
-				    nlines     	5
-				    max_width  	640
-				    label      	
-|Created/modified by: <name>
-|Date: <creation/modification date>
-|
-|Approved by: <name>
-|Date: <approval date>
-				    )
-				line_color 	3342489
-				fill_color 	13434879
-				width      	700
-				height     	275)))
-		    (object ClassDiagram "Architecture Overview - Package and Subsystem Layering"
-			quid       	"354A9751015E"
-			title      	"Architecture Overview - Package and Subsystem Layering"
-			documentation 	
-|This diagram depicts the organization of the design model into layers. This diagram will be presented in the document generated using the SoDA Software Architecture Document.  
-|
-|See Rational Unified Process:
-|Activity: Architectural Analysis
-|Step: Define the High-Level Organization of Subsystems
-|
-|Activity: Incorporate Existing Design Elements
-|Step: Update the Organization of the Design Model
-			
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object NoteView @24
-				location   	(576, 256)
-				label      	(object ItemLabel
-				    Parent_View 	@24
-				    location   	(44, 31)
-				    fill_color 	13434879
-				    nlines     	9
-				    max_width  	1028
-				    label      	
-|This diagram shows the design model layers.
-|
-|See Rational Unified Process:
-|Activity: Architectural Analysis
-|Step: Define the High-Level Organization of Subsystems
-|
-|Activity: Architectural Design
-|Step: Define the Low-level Organization of Subsystems
-				    )
-				line_color 	3342489
-				fill_color 	13434879
-				width      	1088
-				height     	463)
-			    (object NoteView @25
-				location   	(1520, 176)
-				label      	(object ItemLabel
-				    Parent_View 	@25
-				    location   	(1182, 45)
-				    fill_color 	13434879
-				    nlines     	5
-				    max_width  	640
-				    label      	
-|Created/modified by: <name>
-|Date: <creation/modification date>
-|
-|Approved by: <name>
-|Date: <approval date>
-				    )
-				line_color 	3342489
-				fill_color 	13434879
-				width      	700
-				height     	275))))))
-	logical_presentations 	(list unit_reference_list
-	    (object ClassDiagram "Welcome"
-		quid       	"3512226B0028"
-		title      	"Welcome"
-		documentation 	
-|Welcome to the Rational Unified Process Frame Work
-|
-|Purpose of the FrameWork:
-|a) provide a good structure for a Rose model
-|b) provide a style guide with naming conventions/suggestions
-|c) identify a minimal set of diagrams to produce
-|d) relate activities in RUP to Rose diagrams
-|e) provide a basis for sophisticated SoDA reports. For instance based on this structure most of the Rose parts of the "Software Architecture Document" are generated from SoDA.
-|
-		
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list
-		    (object NoteView @26
-			location   	(768, 384)
-			label      	(object ItemLabel
-			    Parent_View 	@26
-			    location   	(121, 96)
-			    fill_color 	13434879
-			    nlines     	14
-			    max_width  	1259
-			    label      	
-|Welcome to the Rational Unified Process Rose Model Framework
-|
-|Purpose of the Framework:
-|a) provide a good structure for a Rose model
-|b) provide a style guide with naming conventions/suggestions
-|c) identify a minimal set of diagrams to produce
-|d) relate activities in RUP to Rose diagrams
-|e) provide a basis for sophisticated SoDA reports. For instance based on this structure most of the Rose parts of the "Software Architecture Document" are generated from SoDA.
-			    )
-			line_color 	3342489
-			fill_color 	13434879
-			width      	1319
-			height     	588)
-		    (object CategoryView "Logical View::Analysis Model::TZ Compiler" @27
-			location   	(1136, 1008)
-			label      	(object ItemLabel
-			    Parent_View 	@27
-			    location   	(951, 924)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	370
-			    justify    	0
-			    label      	"TZ Compiler")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"40E569BC024F"
-			width      	382
-			height     	180)
-		    (object CategoryView "Logical View::Analysis Model::LTClasses" @28
-			location   	(432, 1008)
-			label      	(object ItemLabel
-			    Parent_View 	@28
-			    location   	(247, 924)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	370
-			    justify    	0
-			    label      	"LTClasses")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"40A89DC203B0"
-			width      	382
-			height     	180)
-		    (object CategoryView "Logical View::Analysis Model::Time Zone Database Management" @29
-			location   	(1872, 1040)
-			label      	(object ItemLabel
-			    Parent_View 	@29
-			    location   	(1638, 956)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	468
-			    justify    	0
-			    label      	"Time Zone Database Management")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"40B1E4A6003A"
-			width      	480
-			height     	180)
-		    (object CategoryView "Logical View::Analysis Model::Business Object Model" @30
-			location   	(512, 1408)
-			label      	(object ItemLabel
-			    Parent_View 	@30
-			    location   	(327, 1324)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	370
-			    justify    	0
-			    label      	"Business Object Model")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"35B678080064"
-			width      	382
-			height     	180)
-		    (object CategoryView "Logical View::Analysis Model::Local Time Conversion" @31
-			location   	(1728, 1392)
-			label      	(object ItemLabel
-			    Parent_View 	@31
-			    location   	(1543, 1308)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	370
-			    justify    	0
-			    label      	"Local Time Conversion")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"40B1D43200B7"
-			width      	382
-			height     	180)
-		    (object CategoryView "Logical View::Analysis Model::System Time Management" @32
-			location   	(1040, 1392)
-			label      	(object ItemLabel
-			    Parent_View 	@32
-			    location   	(855, 1308)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	370
-			    justify    	0
-			    label      	"System Time Management")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"40B1D49203C5"
-			width      	382
-			height     	180)))))
-    root_subsystem 	(object SubSystem "Component View"
-	quid       	"34DBB4830143"
-	documentation 	
-|In Rational Unified Process the  "Component View in Rose" is used to organize the implemetation model. 
-|
-|The Implementaition View in Rational Unified Process
-|
-|
-	
-	physical_models 	(list unit_reference_list
-	    (object SubSystem "Implementation Model"
-		quid       	"35B67C9A0348"
-		documentation 	
-|The Implementation Model in Rational Unified Process is a collection of components, and the implementation subsystems that contain them.
-|
-|An architectural view that describes one or several system configurations; the mapping of software components (tasks, modules) to the computing nodes in these configurations.
-|
-|Defines, executables, dll's, files, subsystems, compilation order etc.
-|
-|Rational Unified Process:
-|Activity: Define the Organization of Subsystems
-|
-|These diagram will be presented in the  Implementation  View section in the document generated using the SoDA Software Architecture Document.
-|
-|It is recommended that, in most cases, the mapping should be
-|1:1 between design and implementation, that is, for each package in design there is one subsystem in the implementation model.
-|
-		
-		physical_models 	(list unit_reference_list)
-		physical_presentations 	(list unit_reference_list
-		    (object Module_Diagram "Implementation Model Structure"
-			quid       	"34DBB487006E"
-			title      	"Implementation Model Structure"
-			documentation 	"This diagram presents the organization of the Implementation Model."
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object NoteView @33
-				location   	(624, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@33
-				    location   	(21, 26)
-				    fill_color 	13434879
-				    nlines     	5
-				    max_width  	1170
-				    label      	
-|
-|RationalUnified Process:
-|Activity: Structure the implementation model
-|Step: Create the Initial Implementation Model Structure
-				    )
-				line_color 	3342489
-				fill_color 	13434879
-				width      	1230
-				height     	281)))))
-	    (object SubSystem "Components Analysis"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"M:\\DST\\analysis\\Components.sub"
-		quid       	"40D969B300E0"))
-	physical_presentations 	(list unit_reference_list
-	    (object Module_Diagram "Main"
-		quid       	"35C6339B029E"
-		title      	"Main"
-		documentation 	"This diagram, required by Rose, simply provides a way of navigating to the Implementation Model."
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list
-		    (object SubSysView "Component View::Implementation Model" @34
-			location   	(736, 800)
-			label      	(object ItemLabel
-			    Parent_View 	@34
-			    location   	(552, 713)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	368
-			    justify    	0
-			    label      	"Implementation Model")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"35B67C9A0348"
-			width      	381
-			height     	187)
-		    (object SubSysView "Component View::Components Analysis" @35
-			location   	(1408, 1392)
-			label      	(object ItemLabel
-			    Parent_View 	@35
-			    location   	(1264, 1323)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"Components Analysis")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"40D969B300E0"
-			width      	300
-			height     	150)))))
-    process_structure 	(object Processes
-	quid       	"34DBB4830144"
-	ProcsNDevs 	(list
-	    (object Processor "<processor name>"
-		quid       	"34DBBD4300B4"
-		documentation 	"This node provides <enter a short description here of the functionality and capability of the node>."
-		connections 	(list connection_list
-		    (object Connection_Relationship
-			quid       	"34DBBD4B008C"
-			supplier   	"<device name>"
-			quidu      	"34DBBD47019A"
-			supplier_is_device 	TRUE))
-		characteristics 	""
-		scheduling 	"Preemptive"
-		processes  	(list processes
-		    (object Process "<process name>"
-			quid       	"35DB411001D6"
-			documentation 	"This process corresponds to the process with the same name in the Logical View::Process Model."
-			stereotype 	"process"
-			priority   	"")
-		    (object Process "<thread name>"
-			quid       	"35DB41720348"
-			documentation 	"This process corresponds to the thread with the same name in the Logical View::Process Model."
-			stereotype 	"thread"
-			priority   	"")))
-	    (object Device "<device name>"
-		quid       	"34DBBD47019A"
-		documentation 	"This device provides <enter a short description of the capability the device provides> for the system."
-		characteristics 	"")
-	    (object Process_Diagram "Deployment View"
-		quid       	"34DBB4830146"
-		title      	"Deployment View"
-		documentation 	
-|The Deployment View in Rational Unified Process
-|
-|Defines the typical physical network configurations, including those typically used by end users, as well as special configurations used for development and test.
-|
-|See Rational Unified Process:
-|Activity: Describe Distribution
-|
-|This diagram will be a part of  the SoDA template-generated Software Architecture Document under the "Deployment  View" .
-		
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list
-		    (object ProcessorView "<processor name>" @36
-			location   	(512, 1056)
-			label      	(object ItemLabel
-			    Parent_View 	@36
-			    location   	(276, 900)
-			    nlines     	2
-			    max_width  	400
-			    justify    	0
-			    label      	"<processor name>")
-			icon_style 	"Label"
-			quidu      	"34DBBD4300B4"
-			width      	475
-			height     	381
-			annotation 	3)
-		    (object DeviceView "<device name>" @37
-			location   	(1040, 1056)
-			label      	(object ItemLabel
-			    Parent_View 	@37
-			    location   	(867, 950)
-			    nlines     	2
-			    max_width  	275
-			    justify    	0
-			    label      	"<device name>")
-			icon_style 	"Icon"
-			quidu      	"34DBBD47019A"
-			width      	350
-			height     	282
-			annotation 	0)
-		    (object ConnectionView "" @38
-			stereotype 	TRUE
-			quidu      	"34DBBD4B008C"
-			client     	@36
-			supplier   	@37
-			line_style 	0)
-		    (object NoteView @39
-			location   	(816, 304)
-			label      	(object ItemLabel
-			    Parent_View 	@39
-			    location   	(38, 29)
-			    fill_color 	13434879
-			    nlines     	11
-			    max_width  	1521
-			    label      	
-|This Diagram defines the typical physical network configurations, including those typically used by end users, as well as special configurations used for development and test.
-|
-|· Allocate processes to the various nodes. Allocation takes into account the capacity of the nodes (in terms of
-|both memory and processing), bandwidth of the communication medium (bus, LANs, WANs), and the
-|availability of the hardware and communication links, rerouting, and so on.
-|
-|See, Rational Unified Process:
-|Activity: Describe Distribution
-			    )
-			line_color 	3342489
-			fill_color 	13434879
-			width      	1581
-			height     	563)))))
-    properties 	(object Properties
-	attributes 	(list Attribute_Set
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"propertyId"
-		value      	"783606378")
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"CreatableSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Private"
-				value      	221)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"PublicNotCreatable"
-				value      	213)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"SingleUse"
-				value      	214)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalSingleUse"
-				value      	215)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"MultiUse"
-				value      	219)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalMultiUse"
-				value      	220)))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionBase"
-			value      	("BaseSet" 222))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionExplicit"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionCompare"
-			value      	("CompareSet" 202))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Creatable"
-			value      	("CreatableSet" 221))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateInitialization"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateTermination"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"CollectionClass"
-			value      	"Collection")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"CompareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"(none)"
-				value      	202)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Binary"
-				value      	203)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Text"
-				value      	204)))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateModel"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"InstancingSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Private"
-				value      	221)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"PublicNotCreatable"
-				value      	213)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"SingleUse"
-				value      	214)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalSingleUse"
-				value      	215)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"MultiUse"
-				value      	219)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalMultiUse"
-				value      	220)))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"BaseSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"(none)"
-				value      	222)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"0"
-				value      	223)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"1"
-				value      	224)))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Instancing"
-			value      	("InstancingSet" 221))))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OperationName"
-			value      	"$operation")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"LibraryName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"AliasName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"IsStatic"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ExitCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ReplaceExistingBody"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"DefaultBody"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"IsConst"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"New"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"WithEvents"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Subscript"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"NameIfUnlabeled"
-			value      	"the$supplier")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateGetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateSetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateLetOperation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"New"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"WithEvents"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Subscript"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"NameIfUnlabeled"
-			value      	"the$supplier")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateGetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateSetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateLetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"FullName"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ImplementsDelegation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"FullName"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProjectFile"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateModel"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ImportReferences"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"QuickImport"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"VisualStudio"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Repository"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"SCC"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"propertyId"
-		value      	"360000002")
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"DDLScriptFilename"
-			value      	"DDL1.SQL")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"DropClause"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"PrimaryKeyColumnName"
-			value      	"_ID")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"PrimaryKeyColumnType"
-			value      	"NUMBER(5,0)")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"SchemaNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"SchemaNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TableNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TypeNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TypeNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ViewNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ViewNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"VarrayNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"VarrayNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NestedTableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NestedTableNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ObjectTableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ObjectTableNameSuffix"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsSchema"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OID"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"WhereClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CheckConstraint"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypeLength"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypePrecision"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypeScale"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionOfREFS"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"MethodKind"
-			value      	("MethodKindSet" 1903))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OverloadID"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsReadNoDataState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsReadNoProcessState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsWriteNoDataState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsWriteNoProcessState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsSelfish"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerType"
-			value      	("TriggerTypeSet" 1801))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerEvent"
-			value      	("TriggerEventSet" 1601))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerText"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerReferencingNames"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerForEach"
-			value      	("TriggerForEachSet" 1701))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerWhenClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"MethodKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"MapMethod"
-				value      	1901)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"OrderMethod"
-				value      	1902)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Function"
-				value      	1903)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Procedure"
-				value      	1904)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Operator"
-				value      	1905)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Constructor"
-				value      	1906)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Destructor"
-				value      	1907)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Trigger"
-				value      	1908)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Calculated"
-				value      	1909)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"AFTER"
-				value      	1801)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"BEFORE"
-				value      	1802)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSTEAD OF"
-				value      	1803)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerForEachSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"ROW"
-				value      	1701)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"STATEMENT"
-				value      	1702)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerEventSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT"
-				value      	1601)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"UPDATE"
-				value      	1602)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"DELETE"
-				value      	1603)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR UPDATE"
-				value      	1604)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR DELETE"
-				value      	1605)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"UPDATE OR DELETE"
-				value      	1606)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR UPDATE OR DELETE"
-				value      	1607)))))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NullsAllowed"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Precision"
-			value      	"2")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Scale"
-			value      	"6")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsIndex"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsPrimaryKey"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CompositeUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CheckConstraint"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"cg"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"UseMSVC"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileExtension"
-			value      	"h")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileBackupExtension"
-			value      	"h~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileTemporaryExtension"
-			value      	"h#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"PrecompiledHeader"
-			value      	"stdafx.h")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileExtension"
-			value      	"cpp")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileBackupExtension"
-			value      	"cp~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileTemporaryExtension"
-			value      	"cp#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"PathSeparator"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileNameFormat"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BooleanType"
-			value      	"int")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowTemplates"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowProtectedInheritance"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CommentWidth"
-			value      	60)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByValueContainer"
-			value      	"$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByValueContainer"
-			value      	"OptionalByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByValueContainer"
-			value      	"BoundedListByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByValueContainer"
-			value      	"BoundedSetByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByReferenceContainer"
-			value      	"BoundedListByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByReferenceContainer"
-			value      	"BoundedSetByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByValueContainer"
-			value      	"UnboundedListByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByValueContainer"
-			value      	"UnboundedSetByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByReferenceContainer"
-			value      	"UnboundedListByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByReferenceContainer"
-			value      	"UnboundedSetByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByValueContainer"
-			value      	"AssociationByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByValueContainer"
-			value      	"DictionaryByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByReferenceContainer"
-			value      	"AssociationByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByReferenceContainer"
-			value      	"DictionaryByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GeneratePreserveRegions"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExplicitInstantiations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AlwaysKeepOrphanedCode"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowGenerateOverNewerAnnotations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowGenerateOverNewerVersion"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ImplementationType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ClassKey"
-			value      	"class")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"PutBodiesInSpec"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDefaultConstructor"
-			value      	("GenerateSet" 206))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DefaultConstructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExplicitDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateCopyConstructor"
-			value      	("GenerateSet" 206))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyConstructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExplicitCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDestructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DestructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DestructorKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDestructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssignmentOperation"
-			value      	("GenerateSet" 206))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssignmentVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssignmentKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssignmentOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEqualityOperations"
-			value      	("GenerateSet" 206))
-		    (object Attribute
-			tool       	"cg"
-			name       	"EqualityVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"EqualityKind"
-			value      	("FriendKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineEqualityOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateRelationalOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"RelationalVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"RelationalKind"
-			value      	("FriendKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineRelationalOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateStorageMgmtOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StorageMgmtVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineStorageMgmtOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSubscriptOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSubscriptOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDereferenceOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDereferenceOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateIndirectionOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineIndirectionOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateStreamOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StreamVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineStreamOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ThreeKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"KindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FriendKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"DeclareAndDefine"
-				value      	199)
-			    (object Attribute
-				tool       	"cg"
-				name       	"DeclareOnly"
-				value      	205)
-			    (object Attribute
-				tool       	"cg"
-				name       	"DoNotDeclare"
-				value      	206)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"VisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ConstValue"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDefaultSpecifier"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DefaultSpecifier"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExtensionlessFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeFormat"
-			value      	(value Text 
-|// $package
-|#include "$file"
-|
-			))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludePrecompiledHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeOrder"
-			value      	"AMIR")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyle"
-			value      	("InliningStyleSet" 207))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"InClassDeclaration"
-				value      	208)
-			    (object Attribute
-				tool       	"cg"
-				name       	"FollowingClassDeclaration"
-				value      	207)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"TypesDefined"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeClosure"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExtensionlessFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeFormat"
-			value      	(value Text 
-|// $package
-|#include "$file"
-|
-			))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludePrecompiledHeader"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeOrder"
-			value      	"AMIR")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyle"
-			value      	("InliningStyleSet" 207))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"InClassDeclaration"
-				value      	208)
-			    (object Attribute
-				tool       	"cg"
-				name       	"FollowingClassDeclaration"
-				value      	207)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"TypesDefined"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeClosure"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationKind"
-			value      	("OperationKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsConst"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsExplicit"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExitCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"BodyAnnotations"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsOneWay"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Context"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"Raises"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CCRegion"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAbstractBody"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"Ordered"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$supplier")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedHasRelType"
-			value      	("HasRelTypeSet" 47))
-		    (object Attribute
-			tool       	"cg"
-			name       	"HasRelTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Association"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$targetClass")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"InstanceArguments"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerGet"
-			value      	"$data.get($keys)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerSet"
-			value      	"$data.set($keys,$value)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedContainer"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassContainer"
-			value      	"$supplier *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassInitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetSetByReference"
-			value      	("QualifiedGetSetByReferenceSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetSetByReferenceSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_GetSetByReference"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateQualifiedGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineQualifiedGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateQualifiedSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedSetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedSetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineQualifiedSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberName"
-			value      	"$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssocClassGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassSetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassSetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssocClassSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassForwardReferenceOnly"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedRoleType"
-			value      	("AssocTypeSet" 47))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtAttributeVisibility"
-				value      	211)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CCRegion"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"BodyReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateForwardReference"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DirectoryIsOnSearchList"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"PrecompiledHeader"
-			value      	"stdafx.h")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsNamespace"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"Indent"
-			value      	2)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Version"
-			value      	"5.0")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCClassTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCClassTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Interface_Part"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Connection_Part"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Class_Factory"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CObjectFunctionality"
-			value      	("CObjectFunctionalitySet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CObjectFunctionalitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dynamic"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dyncreate"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Serial"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOverrideGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDataGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DATA_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateFieldGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_FIELD_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMessageGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMessageMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MESSAGE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEFactory"
-			value      	("OLEFactorySet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEFactorySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Built_in"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Simple"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Licensed"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEName"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEClassID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOLECtlType"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLECtlType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOLETypeLib"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibMajor"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibMinor"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GeneratePropPageIDs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEPropPageIDs"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDispatchMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockProperties"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockFunctions"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DispatchDefValue"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDispIdEnum"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISP_ID_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInterfaceMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"INTERFACE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"InitInterface"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateEventMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockEvents"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateEventSinkMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PropNotifySinks"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateConnectionMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CONNECTION_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"ConnectionPointIID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"InheritanceType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLECommands"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MFCDeclares"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"ATL_Declares"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateCOMMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"COM_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateConnectionPointMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CONNECTION_POINT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMsgMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GeneratePropertyMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PROPERTY_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MFCImplements"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCOperationTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCOperationTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Virtual_Override"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Message_Handler"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dispatch_Handler"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Event_Firing_Function"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Event_Sink_Handler"
-				value      	5)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Std_OLE_Method"
-				value      	6)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Command_Parser"
-				value      	7)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Get_Function"
-				value      	8)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Set_Function"
-				value      	9)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Notify_Function"
-				value      	10)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Macro_Generated_Function"
-				value      	11)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MESSAGE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"BodyImage"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateIncludesGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_INCLUDES_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInsertLocation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateIncludesGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_INCLUDES_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInsertLocation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"DDL"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"DDL"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DataBase"
-			value      	("DataBaseSet" 800))
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DataBaseSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"DDL"
-				name       	"ANSI"
-				value      	800)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"Oracle"
-				value      	801)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"SQLServer"
-				value      	802)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"Sybase"
-				value      	803)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"Watcom"
-				value      	804)))
-		    (object Attribute
-			tool       	"DDL"
-			name       	"PrimaryKeyColumnName"
-			value      	"Id")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"PrimaryKeyColumnType"
-			value      	"NUMBER(5)")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"ViewName"
-			value      	"V_")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"TableName"
-			value      	"T_")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"InheritSuffix"
-			value      	"_V")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DropClause"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"BaseViews"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DDLScriptFilename"
-			value      	"DDL1.SQL")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"Directory"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"DDL"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"DDL"
-			name       	"ColumnType"
-			value      	"VARCHAR")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"NullsOK"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"PrimaryKey"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"Unique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"CompositeUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"CheckConstraint"
-			value      	"")))
-	    (object Attribute
-		tool       	"DDL"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"framework"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"IDL"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"StopOnError"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GeneratePreserveRegions"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"ImplementationType"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"ConstValue"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDefaultSpecifier"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DefaultSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IDLElement"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IDLSpecificationType"
-			value      	("IDLSpecSet" 22))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IDLSpecSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Interface"
-				value      	22)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Typedef"
-				value      	54)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Enumeration"
-				value      	8)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Const"
-				value      	71)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Exception"
-				value      	61)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Struct"
-				value      	51)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Union"
-				value      	81)))))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateIDLModule"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"OperationIsOneWay"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Context"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Raises"
-			value      	"")))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsConst"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"ConstValue"
-			value      	"")))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"NameIfUnlabeled"
-			value      	"the_$supplier")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"BoundedHasRelType"
-			value      	("HasRelTypeSet" 47))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"HasRelTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"NameIfUnlabeled"
-			value      	"the_$supplier")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"BoundedRoleType"
-			value      	("AssocTypeSet" 47))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateForwardReference"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Directory"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Java"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"Java"
-			name       	"UsePrefixes"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"InstanceVariablePrefix"
-			value      	"m_")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ClassVariablePrefix"
-			value      	"s_")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultAttributeDataType"
-			value      	"int")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultOperationReturnType"
-			value      	"void")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Editor"
-			value      	("EditorType" 100))
-		    (object Attribute
-			tool       	"Java"
-			name       	"VM"
-			value      	("VMType" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"ClassPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EditorType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"BuiltIn"
-				value      	100)
-			    (object Attribute
-				tool       	"Java"
-				name       	"WindowsShell"
-				value      	101)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"VMType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Sun"
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Microsoft"
-				value      	201)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GlobalImports"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"OpenBraceClassStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UseTabs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UseSpaces"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"SpacingItems"
-			value      	3)
-		    (object Attribute
-			tool       	"Java"
-			name       	"CommentLength"
-			value      	2)
-		    (object Attribute
-			tool       	"Java"
-			name       	"RoseDefaultCommentStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"AsteriskCommentStyle"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavaCommentStyle"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocAuthor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDeprecated"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocException"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocParam"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocReturn"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocSee"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocSerial"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocSerialdata"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocSerialfield"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocSince"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocVersion"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocLink"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"private"
-				value      	64)
-			    (object Attribute
-				tool       	"Java"
-				name       	"package"
-				value      	65)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"CmIdentification"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"AdditionalImports"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"CmIdentification"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"AdditionalImports"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Abstract"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Native"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Synchronized"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultBody"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReplaceExistingBody"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Transient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Volatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"PropertyType"
-			value      	("BeanProperty_Set" 71))
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanProperty_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Not A Property"
-				value      	71)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Simple"
-				value      	72)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bound"
-				value      	73)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Constrained"
-				value      	74)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"IndividualChangeMgt"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write"
-			value      	("Read/Write_Set" 81))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read & Write"
-				value      	81)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read Only"
-				value      	82)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Write Only"
-				value      	83)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFullyQualifiedTypes"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Transient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Volatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"PropertyType"
-			value      	("BeanProperty_Set" 71))
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanProperty_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Not A Property"
-				value      	71)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Simple"
-				value      	72)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bound"
-				value      	73)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Constrained"
-				value      	74)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"IndividualChangeMgt"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write"
-			value      	("Read/Write_Set" 81))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read & Write"
-				value      	81)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read Only"
-				value      	82)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Write Only"
-				value      	83)))))
-	    (object Attribute
-		tool       	"Java"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Objectory41"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"TypeLibImporter"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"ROBE"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Editor"
-			value      	("EditorType" 100))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IncludePath"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"StopOnError"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"EditorType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"BuiltIn"
-				value      	100)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"WindowsShell"
-				value      	101)))))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ConstValue"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ImplementationType"
-			value      	"")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Context"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"OperationIsOneWay"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Order"
-			value      	"")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Order"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"BoundedRoleType"
-			value      	("AssocTypeSet" 47))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"GenerateForwardReference"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Rational Unified Process"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Rose Web Publisher"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"SoDA"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"COM"
-		name       	"propertyId"
-		value      	"783606378")
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"TypeKinds"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"COM"
-				name       	"enum"
-				value      	100)
-			    (object Attribute
-				tool       	"COM"
-				name       	"record"
-				value      	101)
-			    (object Attribute
-				tool       	"COM"
-				name       	"module"
-				value      	102)
-			    (object Attribute
-				tool       	"COM"
-				name       	"interface"
-				value      	103)
-			    (object Attribute
-				tool       	"COM"
-				name       	"dispinterface"
-				value      	104)
-			    (object Attribute
-				tool       	"COM"
-				name       	"coclass"
-				value      	105)
-			    (object Attribute
-				tool       	"COM"
-				name       	"alias"
-				value      	106)
-			    (object Attribute
-				tool       	"COM"
-				name       	"union"
-				value      	107)
-			    (object Attribute
-				tool       	"COM"
-				name       	"max"
-				value      	108)
-			    (object Attribute
-				tool       	"COM"
-				name       	"(none)"
-				value      	109)))
-		    (object Attribute
-			tool       	"COM"
-			name       	"kind"
-			value      	("TypeKinds" 105))
-		    (object Attribute
-			tool       	"COM"
-			name       	"uuid"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"version"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpstring"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpcontext"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"dllname"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"alias"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"Generate"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpstring"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"COM"
-			name       	"id"
-			value      	"")))
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"filename"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"library"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"imports"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"uuid"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"version"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpstring"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpfile"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpcontext"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"lcid"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"Generate"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"COM"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Version Control"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Data Access"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"Data Access"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Access"
-			name       	"project"
-			value      	" ")))
-	    (object Attribute
-		tool       	"Data Access"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"RequisitePro"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"cg"
-		name       	"compiler2.1__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowGenerateOverNewerAnnotations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowGenerateOverNewerVersion"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileExtension"
-			value      	"h")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileBackupExtension"
-			value      	"h~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileTemporaryExtension"
-			value      	"h#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileExtension"
-			value      	"cpp")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileBackupExtension"
-			value      	"cp~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileTemporaryExtension"
-			value      	"cp#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"$ROSECPP_SOURCE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BooleanType"
-			value      	"int")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowTemplates"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExplicitInstantiations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowProtectedInheritance"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByValueContainer"
-			value      	"$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByValueContainer"
-			value      	"OptionalByValue(sizeof($targetClass))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByValueContainer"
-			value      	"BoundedListByValue(sizeof($targetClass),$limit)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByValueContainer"
-			value      	"BoundedSetByValue(sizeof($targetClass),$limit)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByReferenceContainer"
-			value      	"BoundedListByReference($limit)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByReferenceContainer"
-			value      	"BoundedSetByReference($limit)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByValueContainer"
-			value      	"UnboundedListByValue(sizeof($targetClass))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByValueContainer"
-			value      	"UnboundedSetByValue(sizeof($targetClass))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByReferenceContainer"
-			value      	"UnboundedListByReference")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByReferenceContainer"
-			value      	"UnboundedSetByReference")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByValueContainer"
-			value      	"AssociationByValue(sizeof($qualtype), sizeof($qualcont))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByValueContainer"
-			value      	"DictionaryByValue(sizeof($qualtype), sizeof($qualcont))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByReferenceContainer"
-			value      	"AssociationByReference(sizeof($qualtype), sizeof($qualcont))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByReferenceContainer"
-			value      	"DictionaryByReference(sizeof($qualtype), sizeof($qualcont))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"PathSeparator"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileNameFormat"
-			value      	"128vx_b")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AlwaysKeepOrphanedCode"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"UseMSVC"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CommentWidth"
-			value      	60)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"compiler3.0__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowGenerateOverNewerAnnotations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowGenerateOverNewerVersion"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileExtension"
-			value      	"h")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileBackupExtension"
-			value      	"h~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileTemporaryExtension"
-			value      	"h#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileExtension"
-			value      	"cpp")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileBackupExtension"
-			value      	"cp~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileTemporaryExtension"
-			value      	"cp#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"$ROSECPP_SOURCE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BooleanType"
-			value      	"int")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowTemplates"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExplicitInstantiations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowProtectedInheritance"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByValueContainer"
-			value      	"$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByValueContainer"
-			value      	"OptionalByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByValueContainer"
-			value      	"BoundedListByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByValueContainer"
-			value      	"BoundedSetByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByReferenceContainer"
-			value      	"BoundedListByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByReferenceContainer"
-			value      	"BoundedSetByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByValueContainer"
-			value      	"UnboundedListByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByValueContainer"
-			value      	"UnboundedSetByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByReferenceContainer"
-			value      	"UnboundedListByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByReferenceContainer"
-			value      	"UnboundedSetByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByValueContainer"
-			value      	"AssociationByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByValueContainer"
-			value      	"DictionaryByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByReferenceContainer"
-			value      	"AssociationByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByReferenceContainer"
-			value      	"DictionaryByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"PathSeparator"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileNameFormat"
-			value      	"128vx_b")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AlwaysKeepOrphanedCode"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"UseMSVC"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CommentWidth"
-			value      	60)))
-	    (object Attribute
-		tool       	"Rose Model Integrator"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ByVal"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ByRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Optional"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ParamArray"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"COM"
-			name       	"id"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpstring"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")))
-	    (object Attribute
-		tool       	"VC++"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"VC++"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"VC++"
-			name       	"UpdateATL"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"SmartPointersOnAssoc"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"GenerateImports"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"PutImportsIn"
-			value      	"stdafx.h")
-		    (object Attribute
-			tool       	"VC++"
-			name       	"FullPathInImports"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"UseImportAttributes"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"ImportAttributes"
-			value      	"no_namespace named_guids")
-		    (object Attribute
-			tool       	"VC++"
-			name       	"ImportProjTypeLib"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"DefaultTypeLib"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"TypeLibLocation"
-			value      	"")
-		    (object Attribute
-			tool       	"VC++"
-			name       	"CompileProjTypeLib"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"RvcPtyVersion"
-			value      	"1.0")
-		    (object Attribute
-			tool       	"VC++"
-			name       	"ModelIDStyle"
-			value      	2)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"DocStyle"
-			value      	1)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"GenerateIncludes"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"ApplyPattern"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"CreateBackupFiles"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"SupportCodeName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"DocRevEngineer"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"CreateOverviewDiagrams"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"UpdateModelIDsInCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"AttributeTypes"
-			value      	(value Text 
-|attr1=bool
-|attr2=short
-|attr3=int
-|attr4=long
-|attr5=char
-|attr6=float
-|attr7=double
-|attr8=void
-|attr9=clock_t
-|attr10=_complex
-|attr11=_dev_t
-|attr12=div_t
-|attr13=_exception
-|attr14=FILE
-|attr15=_finddata_t
-|attr16=_FPIEEE_RECORD
-|attr17=fpos_t
-|attr18=_HEAPINFO
-|attr19=jmp_buf
-|attr20=lconv
-|attr21=ldiv_t
-|attr22=_off_t
-|attr23=_onexit_t
-|attr24=_PNH
-|attr25=ptrdiff_t
-|attr26=sig_atomic_t
-|attr27=size_t
-|attr28=_stat
-|attr29=time_t
-|attr30=_timeb
-|attr31=tm
-|attr32=_utimbuf
-|attr33=va_list
-|attr34=wchar_t
-|attr35=wctrans_t
-|attr36=wctype_t
-|attr37=_wfinddata_t
-|attr38=_wfinddatai64_t
-|attr39=wint_t
-|attr40=ABORTPROC
-|attr41=ACMDRIVERENUMCB
-|attr42=ACMDRIVERPROC
-|attr43=ACMFILTERCHOOSEHOOKPROC
-|attr44=ACMFILTERENUMCB
-|attr45=ACMFILTERTAGENUMCB
-|attr46=ACMFORMATCHOOSEHOOKPROC
-|attr47=ACMFORMATENUMCB
-|attr48=ACMFORMATTAGENUMCB
-|attr49=APPLET_PROC
-|attr50=ATOM
-|attr51=BOOL
-|attr52=BOOLEAN
-|attr53=BYTE
-|attr54=CALINFO_ENUMPROC
-|attr55=CALLBACK
-|attr56=CHAR
-|attr57=COLORREF
-|attr58=CONST
-|attr59=CRITICAL_SECTION
-|attr60=CTRYID
-|attr61=DATEFMT_ENUMPROC
-|attr62=DESKTOPENUMPROC
-|attr63=DLGPROC
-|attr64=DRAWSTATEPROC
-|attr65=DWORD
-|attr66=EDITWORDBREAKPROC
-|attr67=ENHMFENUMPROC
-|attr68=ENUMRESLANGPROC
-|attr69=ENUMRESNAMEPROC
-|attr70=ENUMRESTYPEPROC
-|attr71=FARPROC
-|attr72=FILE_SEGMENT_ELEMENT
-|attr73=FLOAT
-|attr74=FONTENUMPROC
-|attr75=GOBJENUMPROC
-|attr76=GRAYSTRINGPROC
-|attr77=HACCEL
-|attr78=HANDLE
-|attr79=HBITMAP
-|attr80=HBRUSH
-|attr81=HCOLORSPACE
-|attr82=HCONV
-|attr83=HCONVLIST
-|attr84=HCURSOR
-|attr85=HDC
-|attr86=HDDEDATA
-|attr87=HDESK
-|attr88=HDROP
-|attr89=HDWP
-|attr90=HENHMETAFILE
-|attr91=HFILE
-|attr92=HFONT
-|attr93=HGDIOBJ
-|attr94=HGLOBAL
-|attr95=HHOOK
-|attr96=HICON
-|attr97=HIMAGELIST
-|attr98=HIMC
-|attr99=HINSTANCE
-|attr100=HKEY
-|attr101=HKL
-|attr102=HLOCAL
-|attr103=HMENU
-|attr104=HMETAFILE
-|attr105=HMODULE
-|attr106=HMONITOR
-|attr107=HOOKPROC
-|attr108=HPALETTE
-|attr109=HPEN
-|attr110=HRGN
-|attr111=HRSRC
-|attr112=HSZ
-|attr113=HTREEITEM
-|attr114=HWINSTA
-|attr115=HWND
-|attr116=INT
-|attr117=IPADDR
-|attr118=LANGID
-|attr119=LCID
-|attr120=LCSCSTYPE
-|attr121=LCSGAMUTMATCH
-|attr122=LCTYPE
-|attr123=LINEDDAPROC
-|attr124=LOCALE_ENUMPROC
-|attr125=LONG
-|attr126=LONGLONG
-|attr127=LPARAM
-|attr128=LPBOOL
-|attr129=LPBYTE
-|attr130=LPCCHOOKPROC
-|attr131=LPCFHOOKPROC
-|attr132=LPCOLORREF
-|attr133=LPCRITICAL_SECTION
-|attr134=LPCSTR
-|attr135=LPCTSTR
-|attr136=LPCVOID
-|attr137=LPCWSTR
-|attr138=LPDWORD
-|attr139=LPFIBER_START_ROUTINE
-|attr140=LPFRHOOKPROC
-|attr141=LPHANDLE
-|attr142=LPHANDLER_FUNCTION
-|attr143=LPINT
-|attr144=LPLONG
-|attr145=LPOFNHOOKPROC
-|attr146=LPPAGEPAINTHOOK
-|attr147=LPPAGESETUPHOOK
-|attr148=LPPRINTHOOKPROC
-|attr149=LPPROGRESS_ROUTINE
-|attr150=LPSETUPHOOKPROC
-|attr151=LPSTR
-|attr152=LPSTREAM
-|attr153=LPTHREAD_START_ROUTINE
-|attr154=LPTSTR
-|attr155=LPVOID
-|attr156=LPWORD
-|attr157=LPWSTR
-|attr158=LRESULT
-|attr159=LUID
-|attr160=PBOOL
-|attr161=PBOOLEAN
-|attr162=PBYTE
-|attr163=PCHAR
-|attr164=PCRITICAL_SECTION
-|attr165=PCSTR
-|attr166=PCTSTR
-|attr167=PCWCH
-|attr168=PCWSTR
-|attr169=PDWORD
-|attr170=PFLOAT
-|attr171=PFNCALLBACK
-|attr172=PHANDLE
-|attr173=PHANDLER_ROUTINE
-|attr174=PHKEY
-|attr175=PINT
-|attr176=PLCID
-|attr177=PLONG
-|attr178=PLUID
-|attr179=PROPENUMPROC
-|attr180=PROPENUMPROCEX
-|attr181=PSHORT
-|attr182=PSTR
-|attr183=PTBYTE
-|attr184=PTCHAR
-|attr185=PTIMERAPCROUTINE
-|attr186=PTSTR
-|attr187=PUCHAR
-|attr188=PUINT
-|attr189=PULONG
-|attr190=PUSHORT
-|attr191=PVOID
-|attr192=PWCHAR
-|attr193=PWORD
-|attr194=PWSTR
-|attr195=REGISTERWORDENUMPROC
-|attr196=REGSAM
-|attr197=SC_HANDLE
-|attr198=SC_LOCK
-|attr199=SENDASYNCPROC
-|attr200=SERVICE_STATUS_HANDLE
-|attr201=SHORT
-|attr202=TBYTE
-|attr203=TCHAR
-|attr204=TIMEFMT_ENUMPROC
-|attr205=TIMERPROC
-|attr206=UCHAR
-|attr207=UINT
-|attr208=ULONG
-|attr209=ULONGLONG
-|attr210=UNSIGNED
-|attr211=USHORT
-|attr212=VOID
-|attr213=WCHAR
-|attr214=WINAPI
-|attr215=WINSTAENUMPROC
-|attr216=WNDENUMPROC
-|attr217=WNDPROC
-|attr218=WORD
-|attr219=WPARAM
-|attr220=YIELDPROC
-|attr221=CPoint
-|attr222=CRect
-|attr223=CSize
-|attr224=CString
-|attr225=CTime
-|attr226=CTimeSpan
-|attr227=CCreateContext
-|attr228=CMemoryState
-|attr229=COleSafeArray
-|attr230=CPrintInfo
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Containers"
-			value      	(value Text 
-|cont1=CArray<$TYPE, $TYPE&>
-|cont2=CByteArray
-|cont3=CDWordArray
-|cont4=CObArray
-|cont5=CPtrArray
-|cont6=CStringArray
-|cont7=CUIntArray
-|cont8=CWordArray
-|cont9=CList<$TYPE, $TYPE&>
-|cont10=CPtrList
-|cont11=CObList
-|cont12=CStringList
-|cont13=CMapWordToPtr
-|cont14=CMapPtrToWord
-|cont15=CMapPtrToPtr
-|cont16=CMapWordToOb
-|cont17=CMapStringToPtr
-|cont18=CMapStringToOb
-|cont19=CMapStringToString
-|cont20=CTypedPtrArray<CPtrArray, $TYPE*>
-|cont21=CTypedPtrArray<CObArray, $TYPE*>
-|cont22=CTypedPtrList<CObList, $TYPE*>
-|cont23=CTypedPtrList<CPtrList, $TYPE*>
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"ClassMethods"
-			value      	(value Text 
-|*_body=// ToDo: Add your specialized code here and/or call the base class
-|cm1=$NAME()
-|cm2=$NAME(orig:const $NAME&)
-|cm3=<<virtual>> ~$NAME()
-|cm4=operator=(rhs:$NAME&):$NAME&
-|cm4_body=// ToDo: Add your specialized code here and/or call the base class||return rhs;
-|cm5=<<const>> operator==(rhs:const $NAME&):bool
-|cm5_body=// ToDo: Add your specialized code here and/or call the base class||return false;
-|cm6=<<const>> operator!=(rhs:$NAME&):bool
-|cm6_body=// ToDo: Add your specialized code here and/or call the base class||return false;
-|cm7=<<const>> operator<(rhs:$NAME&):bool
-|cm7_body=// ToDo: Add your specialized code here and/or call the base class||return false;
-|cm8=<<const>> operator>(rhs:$NAME&):bool
-|cm8_body=// ToDo: Add your specialized code here and/or call the base class||return false;
-|cm9=<<const>> operator<=(rhs:$NAME&):bool
-|cm9_body=// ToDo: Add your specialized code here and/or call the base class||return false;
-|cm10=<<const>> operator>=(rhs:$NAME&):bool
-|cm10_body=// ToDo: Add your specialized code here and/or call the base class||return false;
-|cm11=<<friend>> operator>>(i:istream&, rhs:$NAME&):istream&
-|cm11_body=// ToDo: Add your specialized code here and/or call the base class||return i;
-|cm12=<<friend>> operator<<(o:ostream&, rhs:const $NAME&):ostream&
-|cm12_body=// ToDo: Add your specialized code here and/or call the base class||return o;
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Accessors"
-			value      	(value Text 
-|agf=<<const>> get_$BASICNAME():const $TYPE
-|agf_body=return $NAME;
-|asf=set_$BASICNAME(value:$TYPE):void
-|asf_body=$NAME = value;|return;
-|agv=<<const>> get_$BASICNAME():const $TYPE&
-|agv_body=return $NAME;
-|asv=set_$BASICNAME(value:$TYPE&):void
-|asv_body=$NAME = value;|return;
-|agp=<<const>> get_$BASICNAME():const $TYPE
-|agp_body=return $NAME;
-|asp=set_$BASICNAME(value:$TYPE):void
-|asp_body=$NAME = value;|return;
-|agr=<<const>> get_$BASICNAME():const $TYPE
-|agr_body=return $NAME;
-|asr=set_$BASICNAME(value:$TYPE):void
-|asr_body=$NAME = value;|return;
-|aga=<<const>> get_$BASICNAME(index:int):const $TYPE
-|aga_body=return $NAME[index];
-|asa=set_$BASICNAME(index:int, value:$TYPE):void
-|asa_body=$NAME[index] = value;|return;
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Conditionals"
-			value      	(value Text 
-|*_decl=#ifdef _DEBUG
-|*_base=CObject
-|cond1=<<virtual, const>> AssertValid():void
-|cond1_body=$SUPERNAME::AssertValid();
-|cond2=<<virtual, const>> Dump(dc:CDumpContext&):void
-|cond2_body=$SUPERNAME::Dump(dc);
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Patterns"
-			value      	(value Text 
-|patrn1=cm1,cm3,cond1,cond2
-|Patrn1_name=Default
-			))))
-	    (object Attribute
-		tool       	"VC++"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Generate"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"VC++"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"VC++"
-			name       	"InternalMap"
-			value      	(value Text 
-|*:AUTO:AUTO
-|
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"ExportMap"
-			value      	(value Text 
-|*:AUTO:AUTO
-|
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"InitialSourceIncludes"
-			value      	(value Text 
-|"stdafx.h"
-			))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"InitialHeaderIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Copyright"
-			value      	(value Text "Copyright (C) 1991 - 1999 Rational Software Corporation"))))
-	    (object Attribute
-		tool       	"VC++"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Const"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"InitialValue"
-			value      	"")))
-	    (object Attribute
-		tool       	"VC++"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Generate"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"VC++"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"VC++"
-			name       	"DefaultBody"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"VC++"
-		name       	"HiddenTool"
-		value      	FALSE))
-	quid       	"34DBB4830145"))
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/analysis/Integration Test Design.cat
--- a/tzservices/tzserver/analysis/Integration Test Design.cat	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,469 +0,0 @@
-
-(object Petal
-    version    	43
-    _written   	"Rose 6.1.9113.5"
-    charSet    	0)
-
-(object Class_Category "DST Integration Test"
-    is_unit    	TRUE
-    is_loaded  	TRUE
-    quid       	"410F8AD50291"
-    exportControl 	"Public"
-    logical_models 	(list unit_reference_list
-	(object Class "CIntTestStepCompareTimes"
-	    quid       	"410F6666011A"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"410F66A001C6"
-		    supplier   	"Logical View::Design Model::DST Integration Test::CIntTestStep"
-		    quidu      	"410F5C850361")))
-	(object Class "CTestServer"
-	    quid       	"410F5BEE03BF")
-	(object Class "CIntTestStepImportVcal"
-	    quid       	"410F63D900AD"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"410F669B0291"
-		    supplier   	"Logical View::Design Model::DST Integration Test::CIntTestStep"
-		    quidu      	"410F5C850361")))
-	(object Class "CIntTestStepSetLocation"
-	    quid       	"410F63C4004F"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"410F669503D9"
-		    supplier   	"Logical View::Design Model::DST Integration Test::CIntTestStep"
-		    quidu      	"410F5C850361")))
-	(object Class "CIntTest02Step"
-	    quid       	"410F63120233")
-	(object Class "CIntTestStepReadLocation"
-	    quid       	"410F5F110272"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"410F6699010A"
-		    supplier   	"Logical View::Design Model::DST Integration Test::CIntTestStep"
-		    quidu      	"410F5C850361")))
-	(object Class "CIntTestStep"
-	    quid       	"410F5C850361"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"410F5CDC0233"
-		    supplier   	"Logical View::Design Model::DST Integration Test::CDSTTestStep"
-		    quidu      	"410F5C7A011F")))
-	(object Class "CDSTTestStep"
-	    quid       	"410F5C7A011F"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"410F5CE20243"
-		    supplier   	"Logical View::Design Model::DST Integration Test::CTestStep"
-		    quidu      	"410F5C6F0015"))
-	    operations 	(list Operations
-		(object Operation "TestL"
-		    quid       	"411381F60235"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)))
-	(object Class "CTestStep"
-	    quid       	"410F5C6F0015"
-	    documentation 	
-|
-|
-	    
-	    operations 	(list Operations
-		(object Operation "doTestStepPreamble"
-		    quid       	"41137E14015A"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "doTestStep"
-		    quid       	"41137E49012B"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "doTestStepPostamble"
-		    quid       	"41137E52037D"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)))
-	(object Class "CIntTestServer"
-	    quid       	"410F5C100286"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"410F5C30019C"
-		    supplier   	"Logical View::Design Model::DST Integration Test::CDSTTestServer"
-		    quidu      	"410F5C050025"))
-	    used_nodes 	(list uses_relationship_list
-		(object Uses_Relationship
-		    quid       	"410F5EE8009D"
-		    supplier   	"Logical View::Design Model::DST Integration Test::CTestStep"
-		    quidu      	"410F5C6F0015"
-		    supplier_cardinality 	(value cardinality "1..n"))))
-	(object Class "CDSTTestServer"
-	    quid       	"410F5C050025"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"410F5C290229"
-		    supplier   	"Logical View::Design Model::DST Integration Test::CTestServer"
-		    quidu      	"410F5BEE03BF"))))
-    logical_presentations 	(list unit_reference_list
-	(object ClassDiagram "DST Integration Test design"
-	    quid       	"410F8B1103C9"
-	    title      	"DST Integration Test design"
-	    zoom       	100
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::Design Model::DST Integration Test::CTestServer" @1
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(224, 249)
-		    label      	(object ItemLabel
-			Parent_View 	@1
-			location   	(96, 200)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	256
-			justify    	0
-			label      	"CTestServer")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"410F5BEE03BF"
-		    width      	274
-		    height     	120
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::Design Model::DST Integration Test::CDSTTestServer" @2
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(224, 489)
-		    label      	(object ItemLabel
-			Parent_View 	@2
-			location   	(61, 440)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	326
-			justify    	0
-			label      	"CDSTTestServer")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"410F5C050025"
-		    width      	344
-		    height     	120
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::Design Model::DST Integration Test::CIntTestServer" @3
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(224, 745)
-		    label      	(object ItemLabel
-			Parent_View 	@3
-			location   	(78, 696)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	292
-			justify    	0
-			label      	"CIntTestServer")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"410F5C100286"
-		    width      	310
-		    height     	120
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::Design Model::DST Integration Test::CTestStep" @4
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(743, 200)
-		    label      	(object ItemLabel
-			Parent_View 	@4
-			location   	(512, 77)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	462
-			justify    	0
-			label      	"CTestStep")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"410F5C6F0015"
-		    compartment 	(object Compartment
-			Parent_View 	@4
-			location   	(512, 135)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	4
-			max_width  	468)
-		    width      	480
-		    height     	268
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::Design Model::DST Integration Test::CDSTTestStep" @5
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(746, 506)
-		    label      	(object ItemLabel
-			Parent_View 	@5
-			location   	(583, 430)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	326
-			justify    	0
-			label      	"CDSTTestStep")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"410F5C7A011F"
-		    compartment 	(object Compartment
-			Parent_View 	@5
-			location   	(583, 488)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	2
-			max_width  	181)
-		    width      	344
-		    height     	174
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::Design Model::DST Integration Test::CIntTestStep" @6
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(741, 766)
-		    label      	(object ItemLabel
-			Parent_View 	@6
-			location   	(610, 718)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	262
-			justify    	0
-			label      	"CIntTestStep")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"410F5C850361"
-		    width      	280
-		    height     	118
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object NoteView @7
-		    location   	(1565, 409)
-		    label      	(object ItemLabel
-			Parent_View 	@7
-			location   	(1171, 328)
-			fill_color 	13434879
-			nlines     	3
-			max_width  	753
-			label      	"It is intended that the CDSTTestServer and CDSTTestStep are generic classes that implement OOM testing functionality.")
-		    line_color 	3342489
-		    fill_color 	13434879
-		    width      	813
-		    height     	174)
-		(object NoteView @8
-		    location   	(1571, 665)
-		    label      	(object ItemLabel
-			Parent_View 	@8
-			location   	(1174, 565)
-			fill_color 	13434879
-			nlines     	4
-			max_width  	759
-			label      	"Specific integration test server and integration test step are derived to support any integration specific functionality")
-		    line_color 	3342489
-		    fill_color 	13434879
-		    width      	819
-		    height     	213)
-		(object ClassView "Class" "Logical View::Design Model::DST Integration Test::CIntTestStepReadLocation" @9
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(793, 1104)
-		    label      	(object ItemLabel
-			Parent_View 	@9
-			location   	(544, 1055)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	498
-			justify    	0
-			label      	"CIntTestStepReadLocation")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"410F5F110272"
-		    width      	516
-		    height     	120
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::Design Model::DST Integration Test::CIntTestStepImportVcal" @10
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1300, 1107)
-		    label      	(object ItemLabel
-			Parent_View 	@10
-			location   	(1082, 1058)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	436
-			justify    	0
-			label      	"CIntTestStepImportVcal")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"410F63D900AD"
-		    width      	454
-		    height     	120
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::Design Model::DST Integration Test::CIntTestStepCompareTimes" @11
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1815, 1107)
-		    label      	(object ItemLabel
-			Parent_View 	@11
-			location   	(1554, 1058)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	522
-			justify    	0
-			label      	"CIntTestStepCompareTimes")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"410F6666011A"
-		    width      	540
-		    height     	120
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::Design Model::DST Integration Test::CIntTestStepSetLocation" @12
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(280, 1104)
-		    label      	(object ItemLabel
-			Parent_View 	@12
-			location   	(53, 1055)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	454
-			justify    	0
-			label      	"CIntTestStepSetLocation")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"410F63C4004F"
-		    width      	472
-		    height     	120
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object NoteView @13
-		    location   	(968, 1280)
-		    label      	(object ItemLabel
-			Parent_View 	@13
-			location   	(274, 1212)
-			fill_color 	13434879
-			nlines     	2
-			max_width  	1353
-			label      	"There are many different test steps each intended to perform a simple operation.  There are only four shown here to keep the diagram readable")
-		    line_color 	3342489
-		    fill_color 	13434879
-		    width      	1413
-		    height     	149)
-		(object NoteView @14
-		    location   	(1562, 184)
-		    label      	(object ItemLabel
-			Parent_View 	@14
-			location   	(1171, 109)
-			fill_color 	13434879
-			nlines     	3
-			max_width  	746
-			label      	"CTestServer and CTestStep are TestExecute framework base classes")
-		    line_color 	3342489
-		    fill_color 	13434879
-		    width      	806
-		    height     	163)
-		(object InheritView "" @15
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"410F5C290229"
-		    client     	@2
-		    supplier   	@1
-		    line_style 	0)
-		(object InheritView "" @16
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"410F5C30019C"
-		    client     	@3
-		    supplier   	@2
-		    line_style 	0)
-		(object InheritView "" @17
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"410F5CE20243"
-		    client     	@5
-		    supplier   	@4
-		    line_style 	0)
-		(object InheritView "" @18
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"410F5CDC0233"
-		    client     	@6
-		    supplier   	@5
-		    line_style 	0)
-		(object InheritView "" @19
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"410F669B0291"
-		    client     	@10
-		    supplier   	@6
-		    line_style 	0)
-		(object InheritView "" @20
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"410F66A001C6"
-		    client     	@11
-		    supplier   	@6
-		    line_style 	0)
-		(object AttachView "" @21
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    client     	@5
-		    supplier   	@7
-		    line_style 	0)
-		(object AttachView "" @22
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    client     	@8
-		    supplier   	@6
-		    line_style 	0)
-		(object InheritView "" @23
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"410F6699010A"
-		    client     	@9
-		    supplier   	@6
-		    line_style 	0)
-		(object InheritView "" @24
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"410F669503D9"
-		    client     	@12
-		    supplier   	@6
-		    line_style 	0)
-		(object UsesView "" @25
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"410F5EE8009D"
-		    client     	@3
-		    supplier   	@4
-		    line_style 	0)))))
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/analysis/distribution.policy.s60
--- a/tzservices/tzserver/analysis/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/bwins/distribution.policy.s60
--- a/tzservices/tzserver/bwins/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/conf/distribution.policy.s60
--- a/tzservices/tzserver/conf/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/documentation/SGL.GT0197.233 App-Services Tz 9.1 How-To Use the APIs.doc
Binary file tzservices/tzserver/documentation/SGL.GT0197.233 App-Services Tz 9.1 How-To Use the APIs.doc has changed
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/documentation/SGL.GT0403.210 SOS v9.5 Time Zone Services PREQ1776 How-To.doc
Binary file tzservices/tzserver/documentation/SGL.GT0403.210 SOS v9.5 Time Zone Services PREQ1776 How-To.doc has changed
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/documentation/distribution.policy.s60
--- a/tzservices/tzserver/documentation/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/eabi/distribution.policy.s60
--- a/tzservices/tzserver/eabi/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/group/app-services_tz.mrp
--- a/tzservices/tzserver/group/app-services_tz.mrp	Tue Feb 02 10:12:00 2010 +0200
+++ b/tzservices/tzserver/group/app-services_tz.mrp	Fri Apr 16 15:08:06 2010 +0300
@@ -1,3 +1,19 @@
+#
+# 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: 
+#
+
 component	app-services_tz
 source	\sf\mw\appsupport\tzservices\tzserver
 binary	\sf\mw\appsupport\tzservices\tzserver\group	all
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/group/backup_registration.xml
--- a/tzservices/tzserver/group/backup_registration.xml	Tue Feb 02 10:12:00 2010 +0200
+++ b/tzservices/tzserver/group/backup_registration.xml	Fri Apr 16 15:08:06 2010 +0300
@@ -1,10 +1,10 @@
 <?xml version="1.0" standalone="yes"?>
 
 <!--
- Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+ Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
  All rights reserved.
  This component and the accompanying materials are made available
- under the terms of the License "Eclipse Public License v1.0"
+ 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".
 
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/group/distribution.policy.s60
--- a/tzservices/tzserver/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/swiobserverplugin/include/distribution.policy.s60
--- a/tzservices/tzserver/swiobserverplugin/include/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/swiobserverplugin/source/distribution.policy.s60
--- a/tzservices/tzserver/swiobserverplugin/source/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/test/Common/inc/distribution.policy.s60
--- a/tzservices/tzserver/test/Common/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/test/Common/src/distribution.policy.s60
--- a/tzservices/tzserver/test/Common/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/test/Integration/bmarm/distribution.policy.s60
--- a/tzservices/tzserver/test/Integration/bmarm/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/test/Integration/bwins/distribution.policy.s60
--- a/tzservices/tzserver/test/Integration/bwins/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/test/Integration/docs/PREQ234.mdl
--- a/tzservices/tzserver/test/Integration/docs/PREQ234.mdl	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,652 +0,0 @@
-
-(object Petal
-    version    	43
-    _written   	"Rose 6.1.9113.5"
-    charSet    	0)
-
-(object Design "Logical View"
-    is_unit    	TRUE
-    is_loaded  	TRUE
-    quid       	"41F0C7120101"
-    defaults   	(object defaults
-	rightMargin 	0.250000
-	leftMargin 	0.250000
-	topMargin  	0.250000
-	bottomMargin 	0.500000
-	pageOverlap 	0.250000
-	clipIconLabels 	TRUE
-	autoResize 	TRUE
-	snapToGrid 	TRUE
-	gridX      	16
-	gridY      	16
-	defaultFont 	(object Font
-	    size       	10
-	    face       	"Arial"
-	    bold       	FALSE
-	    italics    	FALSE
-	    underline  	FALSE
-	    strike     	FALSE
-	    color      	0
-	    default_color 	TRUE)
-	showMessageNum 	1
-	showClassOfObject 	TRUE
-	notation   	"Unified")
-    root_usecase_package 	(object Class_Category "Use Case View"
-	quid       	"41F0C7120103"
-	exportControl 	"Public"
-	global     	TRUE
-	logical_models 	(list unit_reference_list)
-	logical_presentations 	(list unit_reference_list
-	    (object UseCaseDiagram "Main"
-		quid       	"41F0C7130299"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    root_category 	(object Class_Category "Logical View"
-	quid       	"41F0C7120102"
-	exportControl 	"Public"
-	global     	TRUE
-	subsystem  	"Component View"
-	quidu      	"41F0C7120104"
-	logical_models 	(list unit_reference_list
-	    (object Class "CTestServer"
-		quid       	"41F0C7460084"
-		operations 	(list Operations
-		    (object Operation "CreateTestStep"
-			quid       	"41F0D37B0324"
-			concurrency 	"Sequential"
-			opExportControl 	"Public"
-			uid        	0)))
-	    (object Class "CDstTestServer"
-		quid       	"41F0C75D01EC"
-		superclasses 	(list inheritance_relationship_list
-		    (object Inheritance_Relationship
-			quid       	"41F0C7690278"
-			supplier   	"Logical View::CTestServer"
-			quidu      	"41F0C7460084")))
-	    (object Class "CUtcOffsetChangeEventNotifier"
-		quid       	"41F0C7750392"
-		superclasses 	(list inheritance_relationship_list
-		    (object Inheritance_Relationship
-			quid       	"421466E20021"
-			supplier   	"Logical View::CActive"
-			quidu      	"4214665601D7")))
-	    (object Class "CDstIntServer"
-		quid       	"41F0C7D20084"
-		superclasses 	(list inheritance_relationship_list
-		    (object Inheritance_Relationship
-			quid       	"41F0C7DC0055"
-			supplier   	"Logical View::CDstTestServer"
-			quidu      	"41F0C75D01EC"))
-		used_nodes 	(list uses_relationship_list
-		    (object Uses_Relationship
-			quid       	"41F0C80D00E2"
-			supplier   	"Logical View::CTestStep"
-			quidu      	"41F0C7FB0343"
-			supplier_cardinality 	(value cardinality "1..n"))))
-	    (object Class "CTestStep"
-		quid       	"41F0C7FB0343"
-		operations 	(list Operations
-		    (object Operation "doTestStepL"
-			quid       	"41F0CAB300B3"
-			concurrency 	"Sequential"
-			opExportControl 	"Public"
-			uid        	0)
-		    (object Operation "doTestStepPreambleL"
-			quid       	"41F0CAD10046"
-			concurrency 	"Sequential"
-			opExportControl 	"Public"
-			uid        	0)
-		    (object Operation "doTestStepPostambleL"
-			quid       	"41F0CADB0382"
-			concurrency 	"Sequential"
-			opExportControl 	"Public"
-			uid        	0)))
-	    (object Class "CDSTAutoUpdate"
-		quid       	"41F0C8AC02F5"
-		superclasses 	(list inheritance_relationship_list
-		    (object Inheritance_Relationship
-			quid       	"41F0C8BE00A4"
-			supplier   	"Logical View::CTestStep"
-			quidu      	"41F0C7FB0343")))
-	    (object Class "CUTCOffset"
-		quid       	"41F0CA190065"
-		superclasses 	(list inheritance_relationship_list
-		    (object Inheritance_Relationship
-			quid       	"41F0CA2D0334"
-			supplier   	"Logical View::CTestStep"
-			quidu      	"41F0C7FB0343")))
-	    (object Class "CAutoUpdateNotification"
-		quid       	"421466310179"
-		superclasses 	(list inheritance_relationship_list
-		    (object Inheritance_Relationship
-			quid       	"4214664F00AE"
-			supplier   	"Logical View::CTestStep"
-			quidu      	"41F0C7FB0343")
-		    (object Inheritance_Relationship
-			quid       	"42146661014A"
-			supplier   	"Logical View::CActive"
-			quidu      	"4214665601D7"))
-		used_nodes 	(list uses_relationship_list
-		    (object Uses_Relationship
-			quid       	"421466A50031"
-			supplier   	"Logical View::CUtcOffsetChangeEventNotifier"
-			quidu      	"41F0C7750392"
-			supplier_cardinality 	(value cardinality "1..1"))))
-	    (object Class "CActive"
-		quid       	"4214665601D7")
-	    (object Class "CUTCAlarm"
-		quid       	"421B055F001D"
-		superclasses 	(list inheritance_relationship_list
-		    (object Inheritance_Relationship
-			quid       	"421B076B0087"
-			supplier   	"Logical View::CTestStep"
-			quidu      	"41F0C7FB0343"))
-		used_nodes 	(list uses_relationship_list
-		    (object Uses_Relationship
-			quid       	"421B0780027B"
-			supplier   	"Logical View::CAlarmNotifier"
-			quidu      	"421B072C03E3"
-			supplier_cardinality 	(value cardinality "1..1"))))
-	    (object Class "CAlarmNotifier"
-		quid       	"421B072C03E3"
-		superclasses 	(list inheritance_relationship_list
-		    (object Inheritance_Relationship
-			quid       	"421B078B0077"
-			supplier   	"Logical View::CActive"
-			quidu      	"4214665601D7"))))
-	logical_presentations 	(list unit_reference_list
-	    (object ClassDiagram "Main"
-		quid       	"41F0C71302A7"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list
-		    (object ClassView "Class" "Logical View::CTestServer" @1
-			ShowCompartmentStereotypes 	TRUE
-			IncludeAttribute 	TRUE
-			IncludeOperation 	TRUE
-			location   	(400, 128)
-			label      	(object ItemLabel
-			    Parent_View 	@1
-			    location   	(221, 47)
-			    fill_color 	13434879
-			    nlines     	1
-			    max_width  	358
-			    justify    	0
-			    label      	"CTestServer")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"41F0C7460084"
-			compartment 	(object Compartment
-			    Parent_View 	@1
-			    location   	(221, 108)
-			    icon_style 	"Icon"
-			    fill_color 	16777215
-			    anchor     	2
-			    nlines     	2
-			    max_width  	365)
-			width      	376
-			height     	186
-			annotation 	8
-			autoResize 	TRUE)
-		    (object ClassView "Class" "Logical View::CDstTestServer" @2
-			ShowCompartmentStereotypes 	TRUE
-			IncludeAttribute 	TRUE
-			IncludeOperation 	TRUE
-			location   	(400, 512)
-			label      	(object ItemLabel
-			    Parent_View 	@2
-			    location   	(241, 461)
-			    fill_color 	13434879
-			    nlines     	1
-			    max_width  	318
-			    justify    	0
-			    label      	"CDstTestServer")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"41F0C75D01EC"
-			width      	336
-			height     	126
-			annotation 	8
-			autoResize 	TRUE)
-		    (object InheritView "" @3
-			stereotype 	TRUE
-			line_color 	3342489
-			quidu      	"41F0C7690278"
-			client     	@2
-			supplier   	@1
-			line_style 	0)
-		    (object ClassView "Class" "Logical View::CDstIntServer" @4
-			ShowCompartmentStereotypes 	TRUE
-			IncludeAttribute 	TRUE
-			IncludeOperation 	TRUE
-			location   	(400, 880)
-			label      	(object ItemLabel
-			    Parent_View 	@4
-			    location   	(259, 828)
-			    fill_color 	13434879
-			    nlines     	1
-			    max_width  	282
-			    justify    	0
-			    label      	"CDstIntServer")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"41F0C7D20084"
-			width      	300
-			height     	128
-			annotation 	8
-			autoResize 	TRUE)
-		    (object InheritView "" @5
-			stereotype 	TRUE
-			line_color 	3342489
-			quidu      	"41F0C7DC0055"
-			client     	@4
-			supplier   	@2
-			line_style 	0)
-		    (object ClassView "Class" "Logical View::CTestStep" @6
-			ShowCompartmentStereotypes 	TRUE
-			IncludeAttribute 	TRUE
-			IncludeOperation 	TRUE
-			location   	(1008, 464)
-			label      	(object ItemLabel
-			    Parent_View 	@6
-			    location   	(724, 327)
-			    fill_color 	13434879
-			    nlines     	1
-			    max_width  	569
-			    justify    	0
-			    label      	"CTestStep")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"41F0C7FB0343"
-			compartment 	(object Compartment
-			    Parent_View 	@6
-			    location   	(724, 388)
-			    icon_style 	"Icon"
-			    fill_color 	16777215
-			    anchor     	2
-			    nlines     	4
-			    max_width  	506)
-			width      	587
-			height     	299
-			annotation 	8
-			autoResize 	TRUE)
-		    (object UsesView "" @7
-			stereotype 	TRUE
-			line_color 	3342489
-			quidu      	"41F0C80D00E2"
-			client     	@4
-			supplier   	@6
-			line_style 	0)
-		    (object ClassView "Class" "Logical View::CDSTAutoUpdate" @8
-			ShowCompartmentStereotypes 	TRUE
-			IncludeAttribute 	TRUE
-			IncludeOperation 	TRUE
-			location   	(400, 1408)
-			label      	(object ItemLabel
-			    Parent_View 	@8
-			    location   	(212, 1289)
-			    fill_color 	13434879
-			    nlines     	1
-			    max_width  	376
-			    justify    	0
-			    label      	"CDSTAutoUpdate")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"41F0C8AC02F5"
-			width      	394
-			height     	262
-			annotation 	8
-			autoResize 	TRUE)
-		    (object InheritView "" @9
-			stereotype 	TRUE
-			line_color 	3342489
-			quidu      	"41F0C8BE00A4"
-			client     	@8
-			supplier   	@6
-			line_style 	0)
-		    (object ClassView "Class" "Logical View::CUTCOffset" @10
-			ShowCompartmentStereotypes 	TRUE
-			IncludeAttribute 	TRUE
-			IncludeOperation 	TRUE
-			location   	(864, 1408)
-			label      	(object ItemLabel
-			    Parent_View 	@10
-			    location   	(686, 1289)
-			    fill_color 	13434879
-			    nlines     	1
-			    max_width  	357
-			    justify    	0
-			    label      	"CUTCOffset")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"41F0CA190065"
-			width      	375
-			height     	262
-			annotation 	8
-			autoResize 	TRUE)
-		    (object InheritView "" @11
-			stereotype 	TRUE
-			line_color 	3342489
-			quidu      	"41F0CA2D0334"
-			client     	@10
-			supplier   	@6
-			line_style 	0)
-		    (object NoteView @12
-			location   	(1792, 432)
-			label      	(object ItemLabel
-			    Parent_View 	@12
-			    location   	(1373, 348)
-			    fill_color 	13434879
-			    nlines     	3
-			    max_width  	802
-			    label      	"CTestServer and CTestStep are TestExecute framework base classes")
-			line_color 	3342489
-			fill_color 	13434879
-			width      	862
-			height     	181)
-		    (object ClassView "Class" "Logical View::CAutoUpdateNotification" @13
-			ShowCompartmentStereotypes 	TRUE
-			IncludeAttribute 	TRUE
-			IncludeOperation 	TRUE
-			location   	(1920, 1392)
-			label      	(object ItemLabel
-			    Parent_View 	@13
-			    location   	(1673, 1273)
-			    fill_color 	13434879
-			    nlines     	1
-			    max_width  	494
-			    justify    	0
-			    label      	"CAutoUpdateNotification")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"421466310179"
-			width      	512
-			height     	263
-			annotation 	8
-			autoResize 	TRUE)
-		    (object InheritView "" @14
-			stereotype 	TRUE
-			line_color 	3342489
-			quidu      	"4214664F00AE"
-			client     	@13
-			supplier   	@6
-			line_style 	0)
-		    (object ClassView "Class" "Logical View::CActive" @15
-			ShowCompartmentStereotypes 	TRUE
-			IncludeAttribute 	TRUE
-			IncludeOperation 	TRUE
-			location   	(1568, 2032)
-			label      	(object ItemLabel
-			    Parent_View 	@15
-			    location   	(1452, 1972)
-			    fill_color 	13434879
-			    nlines     	1
-			    max_width  	232
-			    justify    	0
-			    label      	"CActive")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"4214665601D7"
-			width      	250
-			height     	144
-			annotation 	8
-			autoResize 	TRUE)
-		    (object ClassView "Class" "Logical View::CUtcOffsetChangeEventNotifier" @16
-			ShowCompartmentStereotypes 	TRUE
-			IncludeAttribute 	TRUE
-			IncludeOperation 	TRUE
-			location   	(1920, 1760)
-			label      	(object ItemLabel
-			    Parent_View 	@16
-			    location   	(1620, 1681)
-			    fill_color 	13434879
-			    nlines     	1
-			    max_width  	600
-			    justify    	0
-			    label      	"CUtcOffsetChangeEventNotifier")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"41F0C7750392"
-			width      	618
-			height     	182
-			annotation 	8
-			autoResize 	TRUE)
-		    (object UsesView "" @17
-			stereotype 	TRUE
-			line_color 	3342489
-			quidu      	"421466A50031"
-			client     	@13
-			supplier   	@16
-			line_style 	0)
-		    (object InheritView "" @18
-			stereotype 	TRUE
-			line_color 	3342489
-			quidu      	"421466E20021"
-			client     	@16
-			supplier   	@15
-			line_style 	0)
-		    (object ClassView "Class" "Logical View::CUTCAlarm" @19
-			ShowCompartmentStereotypes 	TRUE
-			IncludeAttribute 	TRUE
-			IncludeOperation 	TRUE
-			location   	(1280, 1408)
-			label      	(object ItemLabel
-			    Parent_View 	@19
-			    location   	(1145, 1292)
-			    fill_color 	13434879
-			    nlines     	1
-			    max_width  	270
-			    justify    	0
-			    label      	"CUTCAlarm")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"421B055F001D"
-			width      	288
-			height     	256
-			annotation 	8
-			autoResize 	TRUE)
-		    (object ClassView "Class" "Logical View::CAlarmNotifier" @20
-			ShowCompartmentStereotypes 	TRUE
-			IncludeAttribute 	TRUE
-			IncludeOperation 	TRUE
-			location   	(1280, 1760)
-			label      	(object ItemLabel
-			    Parent_View 	@20
-			    location   	(1114, 1678)
-			    fill_color 	13434879
-			    nlines     	1
-			    max_width  	332
-			    justify    	0
-			    label      	"CAlarmNotifier")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"421B072C03E3"
-			width      	350
-			height     	188
-			annotation 	8
-			autoResize 	TRUE)
-		    (object InheritView "" @21
-			stereotype 	TRUE
-			line_color 	3342489
-			quidu      	"421B076B0087"
-			client     	@19
-			supplier   	@6
-			line_style 	0)
-		    (object UsesView "" @22
-			stereotype 	TRUE
-			line_color 	3342489
-			quidu      	"421B0780027B"
-			client     	@19
-			supplier   	@20
-			line_style 	0)
-		    (object InheritView "" @23
-			stereotype 	TRUE
-			line_color 	3342489
-			quidu      	"421B078B0077"
-			client     	@20
-			supplier   	@15
-			line_style 	0)))))
-    root_subsystem 	(object SubSystem "Component View"
-	quid       	"41F0C7120104"
-	physical_models 	(list unit_reference_list)
-	physical_presentations 	(list unit_reference_list
-	    (object Module_Diagram "Main"
-		quid       	"41F0C7130298"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    process_structure 	(object Processes
-	quid       	"41F0C7120105"
-	ProcsNDevs 	(list
-	    (object Process_Diagram "Deployment View"
-		quid       	"41F0C7120111"
-		title      	"Deployment View"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    properties 	(object Properties
-	attributes 	(list Attribute_Set
-	    (object Attribute
-		tool       	"DDL"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"DDL"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"DDL"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DataBase"
-			value      	("DataBaseSet" 800))
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DataBaseSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"DDL"
-				name       	"ANSI"
-				value      	800)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"Oracle"
-				value      	801)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"SQLServer"
-				value      	802)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"Sybase"
-				value      	803)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"Watcom"
-				value      	804)))
-		    (object Attribute
-			tool       	"DDL"
-			name       	"PrimaryKeyColumnName"
-			value      	"Id")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"PrimaryKeyColumnType"
-			value      	"NUMBER(5)")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"ViewName"
-			value      	"V_")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"TableName"
-			value      	"T_")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"InheritSuffix"
-			value      	"_V")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DropClause"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"BaseViews"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DDLScriptFilename"
-			value      	"DDL1.SQL")))
-	    (object Attribute
-		tool       	"DDL"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"DDL"
-			name       	"ColumnType"
-			value      	"VARCHAR")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"NullsOK"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"PrimaryKey"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"Unique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"CompositeUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"CheckConstraint"
-			value      	"")))
-	    (object Attribute
-		tool       	"DDL"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Rose Model Integrator"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Version Control"
-		name       	"HiddenTool"
-		value      	FALSE))
-	quid       	"41F0C7120106"))
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/test/Integration/docs/SGL.GT0228.234 PREQ 234 App-Services Tz Daylight Saving Integration Test Design
Binary file tzservices/tzserver/test/Integration/docs/SGL.GT0228.234 PREQ 234 App-Services Tz Daylight Saving Integration Test Design has changed
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/test/Integration/docs/SGL.GT0228.714 PREQ 234 Time Auto Update Test Specification
Binary file tzservices/tzserver/test/Integration/docs/SGL.GT0228.714 PREQ 234 Time Auto Update Test Specification has changed
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/test/Integration/docs/distribution.policy.s60
--- a/tzservices/tzserver/test/Integration/docs/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/test/Integration/dstscripts/NextDSTChange.ini
--- a/tzservices/tzserver/test/Integration/dstscripts/NextDSTChange.ini	Tue Feb 02 10:12:00 2010 +0200
+++ b/tzservices/tzserver/test/Integration/dstscripts/NextDSTChange.ini	Fri Apr 16 15:08:06 2010 +0300
@@ -1,7 +1,21 @@
-// TestNextDSTChange.ini
+//
+// Copyright (c) 2007-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".
 //
-// Copyright (c) Symbian Software Ltd 2008 All rights reserved
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
 //
+// Description:
+//
+//
+
+
 
 [LondonDSTStart]
 timezone			=Europe/London
@@ -101,4 +115,4 @@
 expected_system_time_utc	=20070927:010000.000000
 expected_new_offset		=0
 expected_previous_dst_utc	=20070224:010000.000000
-expected_previous_offset	=0
\ No newline at end of file
+expected_previous_offset	=0
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/test/Integration/dstscripts/distribution.policy.s60
--- a/tzservices/tzserver/test/Integration/dstscripts/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/test/Integration/eabi/distribution.policy.s60
--- a/tzservices/tzserver/test/Integration/eabi/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/test/Integration/group/distribution.policy.s60
--- a/tzservices/tzserver/test/Integration/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/test/Integration/inc/distribution.policy.s60
--- a/tzservices/tzserver/test/Integration/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/test/Integration/src/distribution.policy.s60
--- a/tzservices/tzserver/test/Integration/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/test/Integration/teststeps/inc/distribution.policy.s60
--- a/tzservices/tzserver/test/Integration/teststeps/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/test/Integration/teststeps/src/distribution.policy.s60
--- a/tzservices/tzserver/test/Integration/teststeps/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/test/Unit/bmarm/distribution.policy.s60
--- a/tzservices/tzserver/test/Unit/bmarm/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/test/Unit/bwins/distribution.policy.s60
--- a/tzservices/tzserver/test/Unit/bwins/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/test/Unit/dstscripts/distribution.policy.s60
--- a/tzservices/tzserver/test/Unit/dstscripts/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/test/Unit/eabi/distribution.policy.s60
--- a/tzservices/tzserver/test/Unit/eabi/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/test/Unit/group/distribution.policy.s60
--- a/tzservices/tzserver/test/Unit/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/test/Unit/inc/distribution.policy.s60
--- a/tzservices/tzserver/test/Unit/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/test/Unit/resource/hardware/distribution.policy.s60
--- a/tzservices/tzserver/test/Unit/resource/hardware/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/test/Unit/src/distribution.policy.s60
--- a/tzservices/tzserver/test/Unit/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/test/Unit/teststeps/inc/distribution.policy.s60
--- a/tzservices/tzserver/test/Unit/teststeps/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/test/Unit/teststeps/src/distribution.policy.s60
--- a/tzservices/tzserver/test/Unit/teststeps/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/test/component/distribution.policy.s60
--- a/tzservices/tzserver/test/component/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/test/component/testresourcefiles/distribution.policy.s60
--- a/tzservices/tzserver/test/component/testresourcefiles/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/test/group/distribution.policy.s60
--- a/tzservices/tzserver/test/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/test/switest/bwins/distribution.policy.s60
--- a/tzservices/tzserver/test/switest/bwins/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/test/switest/data/distribution.policy.s60
--- a/tzservices/tzserver/test/switest/data/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/test/switest/eabi/distribution.policy.s60
--- a/tzservices/tzserver/test/switest/eabi/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/test/switest/group/distribution.policy.s60
--- a/tzservices/tzserver/test/switest/group/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/test/switest/inc/distribution.policy.s60
--- a/tzservices/tzserver/test/switest/inc/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
diff -r 2e3d3ce01487 -r c4cbaa4fb734 tzservices/tzserver/test/switest/src/distribution.policy.s60
--- a/tzservices/tzserver/test/switest/src/distribution.policy.s60	Tue Feb 02 10:12:00 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file