diff -r 000000000000 -r 2e8eeb919028 configurationengine/source/plugins/symbian/integration-test/testdata/crml_dc_expected/crml_dc.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/configurationengine/source/plugins/symbian/integration-test/testdata/crml_dc_expected/crml_dc.html Thu Mar 11 17:04:37 2010 +0200 @@ -0,0 +1,810 @@ + + + + + +Compare data - ConE + + + +
+ +

CRML Data Compatibility Report


+ + + + + + + + + + +
Source:root.confml
Target:this is ignored\comp_project_2;root.confml
+ +
+ +

Modified keys/files:

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FileRepository UIDRepository nameKey UIDKey nameChanged valueOld valueNew value
Layer1/implml/00000001_simple_keys.crml0x00000001SimpleKeys0x00000001Setting 1typeintreal
Layer1/implml/00000001_simple_keys.crml0x00000001SimpleKeys0x00000002Setting 2backupTrueFalse
Layer1/implml/00000001_simple_keys.crml0x00000001SimpleKeys0x00000003Setting 3cap_wrAlwaysFailNone
Layer1/implml/00000001_simple_keys.crml0x00000001SimpleKeys0x00000003Setting 3read_onlyTrueFalse
Layer1/implml/00000001_simple_keys.crml0x00000001SimpleKeys0x00000004Setting 4cap_wrNoneAlwaysFail
Layer1/implml/00000001_simple_keys.crml0x00000001SimpleKeys0x00000004Setting 4read_onlyFalseTrue
Layer1/implml/00000001_simple_keys.crml0x00000001SimpleKeys0x00000007Setting 7refSimpleKeys.Setting7SimpleKeys.Setting7RefChanged
Layer1/implml/00000001_simple_keys.crml0x00000001SimpleKeys0x00000008Setting 8cap_rdReadDeviceDataReadUserData
Layer1/implml/00000001_simple_keys.crml0x00000001SimpleKeys0x00000008Setting 8cap_wrWriteDeviceDataWriteUserData
Layer1/implml/00000001_simple_keys.crml0x00000001SimpleKeys0x00000008Setting 8sid_rd0xAABBCCDD0x11223344
Layer1/implml/00000001_simple_keys.crml0x00000001SimpleKeys0x00000008Setting 8sid_wr0xDDCCBBAA0x44332211
Layer1/implml/00000001_simple_keys.crml0x00000001SimpleKeys0x00000009Setting 9cap_rdReadDeviceDataNone
Layer1/implml/00000001_simple_keys.crml0x00000001SimpleKeys0x00000009Setting 9cap_wrWriteDeviceDataNone
Layer1/implml/00000001_simple_keys.crml0x00000001SimpleKeys0x00000009Setting 9sid_rd0xAABBCCDDNone
Layer1/implml/00000001_simple_keys.crml0x00000001SimpleKeys0x00000009Setting 9sid_wr0xDDCCBBAANone
Layer1/implml/00000002_bitmask_keys.crml0x00000002BitmaskKeys0x00000001Bitmask 1 (name changed)cap_rdReadDeviceDataReadUserData
Layer1/implml/00000002_bitmask_keys.crml0x00000002BitmaskKeys0x00000001Bitmask 1 (name changed)cap_wrWriteDeviceDataWriteUserData
Layer1/implml/00000002_bitmask_keys.crml0x00000002BitmaskKeys0x00000001Bitmask 1 (name changed)sid_rd0xAABBCCDD0x11223344
Layer1/implml/00000002_bitmask_keys.crml0x00000002BitmaskKeys0x00000001Bitmask 1 (name changed)sid_wr0xDDCCBBAA0x44332211
Layer1/implml/00000002_bitmask_keys.crml0x00000002BitmaskKeys0x00000001Bitmask 1 (name changed)typeintbinary
Layer1/implml/00000002_bitmask_keys.crml0x00000002BitmaskKeys0x00000001 (bit 2)Bitmask 1 (name changed)refBitmaskKeys.Bit2BitmaskKeys.Bit2RefChanged
Layer1/implml/00000002_bitmask_keys.crml0x00000002BitmaskKeys0x00000001 (bit 3)Bitmask 1 (name changed)invertFalseTrue
Layer1/implml/00000003_key_ranges.crml0x00000003KeyRanges0x00001001-0x00001FFFSequence 1 (name changed)backupTrueFalse
Layer1/implml/00000003_key_ranges.crml0x00000003KeyRanges0x00001001-0x00001FFFSequence 1 (name changed)cap_rdReadDeviceDataReadUserData
Layer1/implml/00000003_key_ranges.crml0x00000003KeyRanges0x00001001-0x00001FFFSequence 1 (name changed)cap_wrWriteDeviceDataWriteUserData
Layer1/implml/00000003_key_ranges.crml0x00000003KeyRanges0x00001001-0x00001FFFSequence 1 (name changed)first_index12
Layer1/implml/00000003_key_ranges.crml0x00000003KeyRanges0x00001001-0x00001FFFSequence 1 (name changed)index_bits0x00000FF00x00001FE0
Layer1/implml/00000003_key_ranges.crml0x00000003KeyRanges0x00001001-0x00001FFFSequence 1 (name changed)refKeyRanges.Seq1KeyRanges.Seq1RefChanged
Layer1/implml/00000003_key_ranges.crml0x00000003KeyRanges0x00001001-0x00001FFFSequence 1 (name changed)sid_rd0x112233440xAABBCCDD
Layer1/implml/00000003_key_ranges.crml0x00000003KeyRanges0x00001001-0x00001FFFSequence 1 (name changed)sid_wr0x443322110xDDCCBBAA
Layer1/implml/00000003_key_ranges.crml0x00000003KeyRanges0x00001001-0x00001FFF (sub-key 0x00000002)Sequence 1 (name changed)refSubSetting2SubSetting2RefChanged
Layer1/implml/00000003_key_ranges.crml0x00000003KeyRanges0x00001001-0x00001FFF (sub-key 0x00000002)Sequence 1 (name changed)typeintreal
Layer1/implml/00000003_key_ranges.crml0x00000003KeyRanges0x00002000-0x00002FFFRange 2backupTrueFalse
Layer1/implml/00000003_key_ranges.crml0x00000003KeyRanges0x00002000-0x00002FFFRange 2read_onlyTrueFalse
Layer1/implml/00000003_key_ranges.crml0x00000003KeyRanges0x00003000-0x00003FFFRange 3read_onlyFalseTrue
Layer1/implml/00000004_key_type_changed.crml0x00000004KeyTypeChanged0x00000001Simple key to bitmask keykey_typesimple_keybitmask_key
Layer1/implml/00000004_key_type_changed.crml0x00000004KeyTypeChanged0x00000002Bitmask key to simple keykey_typebitmask_keysimple_key
Layer1/implml/00000004_key_type_changed.crml0x00000004KeyTypeChanged0x00000003Bitmask key to simple key (other attrs changed also [xyz])backupTrueFalse
Layer1/implml/00000004_key_type_changed.crml0x00000004KeyTypeChanged0x00000003Bitmask key to simple key (other attrs changed also [xyz])cap_rdReadDeviceDataReadUserData
Layer1/implml/00000004_key_type_changed.crml0x00000004KeyTypeChanged0x00000003Bitmask key to simple key (other attrs changed also [xyz])cap_wrAlwaysFailWriteUserData
Layer1/implml/00000004_key_type_changed.crml0x00000004KeyTypeChanged0x00000003Bitmask key to simple key (other attrs changed also [xyz])read_onlyTrueFalse
Layer1/implml/00000004_key_type_changed.crml0x00000004KeyTypeChanged0x00000003Bitmask key to simple key (other attrs changed also [xyz])sid_rd0xAABBCCDD0x11223344
Layer1/implml/00000004_key_type_changed.crml0x00000004KeyTypeChanged0x00000003Bitmask key to simple key (other attrs changed also [xyz])sid_wrNone0x44332211
Layer1/implml/00000004_key_type_changed.crml0x00000004KeyTypeChanged0x00000003Bitmask key to simple key (other attrs changed also [xyz])typeintbinary
Layer1/implml/00000005_repo_attrs_changed.crml0x00000005RepoAttrsChangedXyzNonebackupTrueFalse
Layer1/implml/00000005_repo_attrs_changed.crml0x00000005RepoAttrsChangedXyzNonecap_rdReadDeviceDataReadUserData
Layer1/implml/00000005_repo_attrs_changed.crml0x00000005RepoAttrsChangedXyzNonecap_wrWriteDeviceDataWriteUserData
Layer1/implml/00000005_repo_attrs_changed.crml0x00000005RepoAttrsChangedXyzNonerfsTrueFalse
Layer1/implml/00000005_repo_attrs_changed.crml0x00000005RepoAttrsChangedXyzNonesid_rd0x112233440xAABBCCDD
Layer1/implml/00000005_repo_attrs_changed.crml0x00000005RepoAttrsChangedXyzNonesid_wr0x443322110xDDCCBBAA
Layer1/implml/00000005_repo_attrs_changed.crml0x00000005RepoAttrsChangedXyzNoneuid_nameRepoAttrsChangedRepoAttrsChangedXyz
Layer1/implml/00000006_renamed_repo_xyz.crml0x00000006RenamedRepoNonefileLayer1/implml/00000006_renamed_repo.crmlLayer1/implml/00000006_renamed_repo_xyz.crml
+ + +

Added keys/files:

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FileRepository UIDRepository nameKey UIDKey name
Layer1/implml/00000001_simple_keys.crml0x00000001SimpleKeys0x20000001Added setting
Layer1/implml/00000002_bitmask_keys.crml0x00000002BitmaskKeys0x00000001 (bit 5)Bitmask 1 (name changed)
Layer1/implml/00000002_bitmask_keys.crml0x00000002BitmaskKeys0x20000001Added bitmask
Layer1/implml/00000003_key_ranges.crml0x00000003KeyRanges0x00001001-0x00001FFF (sub-key 0x00000005)Sequence 1 (name changed)
Layer1/implml/00000003_key_ranges.crml0x00000003KeyRanges0x20001001-0x20001FFFAdded range
Layer1/implml/20000001_added_repo.crml0x20000001AddedRepo
+ + +

Removed keys/files:

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FileRepository UIDRepository nameKey UIDKey name
Layer1/implml/00000001_simple_keys.crml0x00000001SimpleKeys0x10000001Removed setting
Layer1/implml/00000002_bitmask_keys.crml0x00000002BitmaskKeys0x00000001 (bit 4)Bitmask 1
Layer1/implml/00000002_bitmask_keys.crml0x00000002BitmaskKeys0x10000001Removed bitmask
Layer1/implml/00000003_key_ranges.crml0x00000003KeyRanges0x00001001-0x00001FFF (sub-key 0x00000004)Sequence 1
Layer1/implml/00000003_key_ranges.crml0x00000003KeyRanges0x10001001-0x10001FFFRemoved range
Layer1/implml/10000001_removed_repo.crml0x10000001RemovedRepo
+ + +

Duplicate repositories:

+ + + + + + + + + + + + + + +
Repository UIDFiles in sourceFiles in target
0x30000000 + Layer1/implml/30000000_duplicate_repo1_proj1.crml
Layer1/implml/30000000_duplicate_repo2_proj1.crml
+
+ Layer1/implml/30000000_duplicate_repo1_proj2.crml
Layer1/implml/30000000_duplicate_repo2_proj2.crml
+
+
+ + + \ No newline at end of file