You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sa...@apache.org on 2014/11/13 14:47:23 UTC
[1/2] git commit: updated refs/heads/master to 057ba16
Repository: cloudstack
Updated Branches:
refs/heads/master 63ff683b8 -> 057ba164f
CLOUDSTACK-7904: EN-UK: CentOS 6.5 GUI: Key translation fails for some EN- UK keyboard keys.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7f2219bc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7f2219bc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7f2219bc
Branch: refs/heads/master
Commit: 7f2219bcbb4835123bdb24ba733651b9a1f2bdc6
Parents: 63ff683
Author: Sanjay Tripathi <sa...@citrix.com>
Authored: Thu Nov 13 18:56:29 2014 +0530
Committer: Sanjay Tripathi <sa...@citrix.com>
Committed: Thu Nov 13 19:16:02 2014 +0530
----------------------------------------------------------------------
systemvm/js/ajaxkeys.js | 43 +++++++++++-------------------------------
systemvm/js/ajaxviewer.js | 4 +++-
2 files changed, 14 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7f2219bc/systemvm/js/ajaxkeys.js
----------------------------------------------------------------------
diff --git a/systemvm/js/ajaxkeys.js b/systemvm/js/ajaxkeys.js
index 26c2996..3053b7d 100644
--- a/systemvm/js/ajaxkeys.js
+++ b/systemvm/js/ajaxkeys.js
@@ -289,47 +289,26 @@ var keyboardTables = [
]
}
}, {tindex: 2, keyboardType: KEYBOARD_TYPE_UK, mappingTable:
- {X11: [
- //[223 = `¬¦]
- {keycode: 223, entry : 0x60, browser: "IE"},
- ],
+ {X11: [],
keyPress: [
- //[34 = "]
- {keycode: 34, entry:
- [{type : KEY_DOWN, code : 0x40, modifiers : 64, shift : true}]
- },
+ //[34 = "]
+ {keycode: 34, entry: 0x40, guestos: "windows"},
//[35 = #]
- {keycode: 35, entry:
- [{type : KEY_DOWN, code : 0x5c, modifiers : 0, shift : false}]
- },
+ {keycode: 35, entry: 0x5c, guestos: "windows"},
// [64 = @]
- {keycode: 64, entry:
- [{type : KEY_DOWN, code : 0x22, modifiers : 64, shift : true}]
- },
+ {keycode: 64, entry: 0x22, guestos: "windows"},
// [92 = \]
- {keycode: 92, entry:
- [{type : KEY_DOWN, code : 0xa6, modifiers : 0, shift : false}]
- },
+ {keycode: 92, entry: 0xa6, guestos: "windows"},
// [124 = |]
- {keycode: 124, entry:
- [{type : KEY_DOWN, code : 0xa6, modifiers : 64, shift : true}]
- },
+ {keycode: 124, entry: 0xa6, guestos: "windows"},
// [126 = ~]
- {keycode: 126, entry:
- [{type : KEY_DOWN, code : 0x7c, modifiers : 64, shift : true}]
- },
+ {keycode: 126, entry: 0x7c, guestos: "windows"},
// [163 = £]
- {keycode: 163, entry:
- [{type : KEY_DOWN, code : 0x23, modifiers : 64, shift : true}]
- },
+ {keycode: 163, entry: 0x23, guestos: "windows"},
// [172 = ¬]
- {keycode: 172, entry:
- [{type : KEY_DOWN, code : 0x7e, modifiers : 64, shift : true}]
- },
+ {keycode: 172, entry: 0x7e, guestos: "windows"},
// [166 = ¦]
- {keycode: 166, entry:
- [{type : KEY_DOWN, code : 0x60, modifiers : 896, shift : false}]
- }
+ {keycode: 166, entry: [{type : KEY_DOWN, code : 0x60, modifiers : 896, shift : false}], guestos: "windows"}
]
}
}]
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7f2219bc/systemvm/js/ajaxviewer.js
----------------------------------------------------------------------
diff --git a/systemvm/js/ajaxviewer.js b/systemvm/js/ajaxviewer.js
index 123f182..db5ed45 100644
--- a/systemvm/js/ajaxviewer.js
+++ b/systemvm/js/ajaxviewer.js
@@ -761,7 +761,9 @@ AjaxViewer.prototype = {
for (var j = 0; j < keyPressMaps.length; j++) {
var code = keyPressMaps[j].keycode;
var mappedEntry = keyPressMaps[j].entry;
- this.keyboardMappers[keyboardType].jsKeyPressX11KeysymMap[code] = mappedEntry;
+ if(keyPressMaps[j].guestos == undefined || keyPressMaps[j].guestos == this.guestos) {
+ this.keyboardMappers[keyboardType].jsKeyPressX11KeysymMap[code] = mappedEntry;
+ }
}
}
}
[2/2] git commit: updated refs/heads/master to 057ba16
Posted by sa...@apache.org.
CLOUDSTACK-7905: Add OEL 6.5 32/64 bit guest os support.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/057ba164
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/057ba164
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/057ba164
Branch: refs/heads/master
Commit: 057ba164f67ba4fa7ee6935c368d1ab77253e3e4
Parents: 7f2219b
Author: Sanjay Tripathi <sa...@citrix.com>
Authored: Thu Nov 13 18:59:56 2014 +0530
Committer: Sanjay Tripathi <sa...@citrix.com>
Committed: Thu Nov 13 19:19:02 2014 +0530
----------------------------------------------------------------------
setup/db/db/schema-441to450.sql | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/057ba164/setup/db/db/schema-441to450.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-441to450.sql b/setup/db/db/schema-441to450.sql
index b36c0b5..26608a1 100644
--- a/setup/db/db/schema-441to450.sql
+++ b/setup/db/db/schema-441to450.sql
@@ -563,6 +563,8 @@ INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name, crea
INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name, created) VALUES (247, UUID(), 3, 'Oracle Linux 7', utc_timestamp());
INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name, created) VALUES (248, UUID(), 1, 'CentOS 6 (32-bit)', utc_timestamp());
INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name, created) VALUES (249, UUID(), 1, 'CentOS 6 (64-bit)', utc_timestamp());
+INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name, created) VALUES (250, UUID(), 3, 'Oracle Enterprise Linux 6.5 (32-bit)', utc_timestamp());
+INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name, created) VALUES (251, UUID(), 3, 'Oracle Enterprise Linux 6.5 (64-bit)', utc_timestamp());
INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(),'Xenserver', '6.5.0', 'CentOS 4.5 (32-bit)', 1, utc_timestamp(), 0);
INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(),'Xenserver', '6.5.0', 'CentOS 4.6 (32-bit)', 2, utc_timestamp(), 0);
@@ -645,6 +647,8 @@ INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervis
INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(),'Xenserver', '6.5.0', 'Oracle Enterprise Linux 6 (64-bit)', 220, utc_timestamp(), 0);
INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(),'Xenserver', '6.5.0', 'Oracle Enterprise Linux 6 (32-bit)', 235, utc_timestamp(), 0);
INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(),'Xenserver', '6.5.0', 'Oracle Enterprise Linux 6 (64-bit)', 236, utc_timestamp(), 0);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(),'Xenserver', '6.5.0', 'Oracle Enterprise Linux 6 (32-bit)', 250, utc_timestamp(), 0);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(),'Xenserver', '6.5.0', 'Oracle Enterprise Linux 6 (64-bit)', 251, utc_timestamp(), 0);
INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(),'Xenserver', '6.5.0', 'Oracle Linux 7', 247, utc_timestamp(), 0);
INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(),'Xenserver', '6.5.0', 'Red Hat Enterprise Linux 4.5 (32-bit)', 26, utc_timestamp(), 0);
INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(),'Xenserver', '6.5.0', 'Red Hat Enterprise Linux 4.6 (32-bit)', 27, utc_timestamp(), 0);