diff --git a/console-proxy/.classpath b/console-proxy/.classpath
index 1d770355e58..e06931e3c18 100644
--- a/console-proxy/.classpath
+++ b/console-proxy/.classpath
@@ -2,7 +2,7 @@
-
+
diff --git a/console-viewer/.classpath b/console-viewer/.classpath
index e8a8d8c0a84..170f58a8bbb 100644
--- a/console-viewer/.classpath
+++ b/console-viewer/.classpath
@@ -2,6 +2,6 @@
-
+
diff --git a/deps/cloud.userlibraries b/deps/cloud.userlibraries
index 26376be724a..33cce167690 100644
--- a/deps/cloud.userlibraries
+++ b/deps/cloud.userlibraries
@@ -1,103 +1,103 @@
-
-
-
-
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/ui/scripts/cloud.core.pod.js b/ui/scripts/cloud.core.pod.js
index 5c1ab9eeffa..27525a63e25 100644
--- a/ui/scripts/cloud.core.pod.js
+++ b/ui/scripts/cloud.core.pod.js
@@ -316,7 +316,7 @@ function bindAddClusterButton($leftmenuItem1) {
}
dialogAddCluster.find("#cluster_hypervisor").change(function() {
- if($(this).val() == "VmWare") {
+ if($(this).val() == "VMware") {
$('li[input_group="vmware"]', dialogAddCluster).show();
dialogAddCluster.find("#type_dropdown").change();
} else {
@@ -341,12 +341,12 @@ function bindAddClusterButton($leftmenuItem1) {
var hypervisor = $thisDialog.find("#cluster_hypervisor").val();
var clusterType="CloudManaged";
- if(hypervisor == "VmWare")
+ if(hypervisor == "VMware")
clusterType = $thisDialog.find("#type_dropdown").val();
// validate values
var isValid = true;
- if(hypervisor == "VmWare" && clusterType != "CloudManaged") {
+ if(hypervisor == "VMware" && clusterType != "CloudManaged") {
isValid &= validateString("vCenter Server", $thisDialog.find("#cluster_hostname"), $thisDialog.find("#cluster_hostname_errormsg"));
isValid &= validateString("vCenter user", $thisDialog.find("#cluster_username"), $thisDialog.find("#cluster_username_errormsg"));
isValid &= validateString("Password", $thisDialog.find("#cluster_password"), $thisDialog.find("#cluster_password_errormsg"));
@@ -366,7 +366,7 @@ function bindAddClusterButton($leftmenuItem1) {
array1.push("&podId="+podId);
var clusterName = trim($thisDialog.find("#cluster_name").val());
- if(hypervisor == "VmWare" && clusterType != "CloudManaged") {
+ if(hypervisor == "VMware" && clusterType != "CloudManaged") {
var username = trim($thisDialog.find("#cluster_username").val());
array1.push("&username="+todb(username));
@@ -443,7 +443,7 @@ function bindAddHostButton($leftmenuItem1) {
if(clusterId == null)
return;
var clusterObj = clustersUnderOnePod[clusterId];
- if(clusterObj.hypervisortype == "VmWare") {
+ if(clusterObj.hypervisortype == "VMware") {
$('li[input_group="vmware"]', dialogAddHost).show();
$('li[input_group="general"]', dialogAddHost).hide();
} else {
@@ -483,7 +483,7 @@ function bindAddHostButton($leftmenuItem1) {
/*
dialogAddHost.find("#host_hypervisor").change(function() {
- if($(this).val() == "VmWare") {
+ if($(this).val() == "VMware") {
$('li[input_group="vmware"]', dialogAddHost).show();
$('li[input_group="general"]', dialogAddHost).hide();
} else {
@@ -514,7 +514,7 @@ function bindAddHostButton($leftmenuItem1) {
if(clusterId != null) {
clusterObj = clustersUnderOnePod[clusterId];
hypervisor = clusterObj.hypervisortype;
- if(hypervisor == "VmWare") {
+ if(hypervisor == "VMware") {
isValid &= validateString("vCenter Address", $thisDialog.find("#host_vcenter_address"), $thisDialog.find("#host_vcenter_address_errormsg"));
isValid &= validateString("vCenter User", $thisDialog.find("#host_vcenter_username"), $thisDialog.find("#host_vcenter_username_errormsg"));
isValid &= validateString("vCenter Password", $thisDialog.find("#host_vcenter_password"), $thisDialog.find("#host_vcenter_password_errormsg"));
@@ -539,7 +539,7 @@ function bindAddHostButton($leftmenuItem1) {
var clustertype = clusterObj.clustertype;
array1.push("&clustertype=" + clustertype);
- if(hypervisor == "VmWare") {
+ if(hypervisor == "VMware") {
var username = trim($thisDialog.find("#host_vcenter_username").val());
array1.push("&username="+todb(username));
@@ -679,7 +679,7 @@ function bindAddPrimaryStorageButton($leftmenuItem1) {
$protocolSelector.empty();
$protocolSelector.append('');
$protocolSelector.append('');
- } else if(objCluster.hypervisortype == "VmWare") {
+ } else if(objCluster.hypervisortype == "VMware") {
$protocolSelector.empty();
$protocolSelector.append('');
$protocolSelector.append('');
diff --git a/ui/scripts/cloud.core.resource.js b/ui/scripts/cloud.core.resource.js
index 51988505da9..557409c6718 100644
--- a/ui/scripts/cloud.core.resource.js
+++ b/ui/scripts/cloud.core.resource.js
@@ -685,7 +685,7 @@ function initAddClusterShortcut() {
var $hypervisorDropdown = $dialogAddCluster.find("#cluster_hypervisor");
$hypervisorDropdown.change(function() {
- if($(this).val() == "VmWare") {
+ if($(this).val() == "VMware") {
$('li[input_group="vmware"]', $dialogAddCluster).show();
$dialogAddCluster.find("#type_dropdown").change();
} else {
@@ -717,13 +717,13 @@ function initAddClusterShortcut() {
// validate values
var hypervisor = $thisDialog.find("#cluster_hypervisor").val();
var clusterType="CloudManaged";
- if(hypervisor == "VmWare")
+ if(hypervisor == "VMware")
clusterType = $thisDialog.find("#type_dropdown").val();
var isValid = true;
isValid &= validateDropDownBox("Zone", $thisDialog.find("#zone_dropdown"), $thisDialog.find("#zone_dropdown_errormsg"));
isValid &= validateDropDownBox("Pod", $thisDialog.find("#pod_dropdown"), $thisDialog.find("#pod_dropdown_errormsg"));
- if(hypervisor == "VmWare" && clusterType != "CloudManaged") {
+ if(hypervisor == "VMware" && clusterType != "CloudManaged") {
isValid &= validateString("vCenter Server", $thisDialog.find("#cluster_hostname"), $thisDialog.find("#cluster_hostname_errormsg"));
isValid &= validateString("vCenter user", $thisDialog.find("#cluster_username"), $thisDialog.find("#cluster_username_errormsg"));
isValid &= validateString("Password", $thisDialog.find("#cluster_password"), $thisDialog.find("#cluster_password_errormsg"));
@@ -751,7 +751,7 @@ function initAddClusterShortcut() {
array1.push("&podId="+podId);
var clusterName = trim($thisDialog.find("#cluster_name").val());
- if(hypervisor == "VmWare" && clusterType != "CloudManaged") {
+ if(hypervisor == "VMware" && clusterType != "CloudManaged") {
var username = trim($thisDialog.find("#cluster_username").val());
array1.push("&username="+todb(username));
@@ -827,7 +827,7 @@ function initAddHostShortcut() {
/*
$dialogAddHost.find("#host_hypervisor").change(function() {
- if($(this).val() == "VmWare") {
+ if($(this).val() == "VMware") {
$('li[input_group="general"]', $dialogAddHost).hide();
$('li[input_group="vmware"]', $dialogAddHost).show();
} else {
@@ -870,7 +870,7 @@ function initAddHostShortcut() {
if(clusterId == null)
return;
var clusterObj = clustersUnderOnePod[clusterId];
- if(clusterObj.hypervisortype == "VmWare") {
+ if(clusterObj.hypervisortype == "VMware") {
$('li[input_group="vmware"]', $dialogAddHost).show();
$('li[input_group="general"]', $dialogAddHost).hide();
} else {
@@ -901,7 +901,7 @@ function initAddHostShortcut() {
if(clusterId != null) {
clusterObj = clustersUnderOnePod[clusterId];
hypervisor = clusterObj.hypervisortype;
- if(hypervisor == "VmWare") {
+ if(hypervisor == "VMware") {
isValid &= validateString("vCenter Address", $thisDialog.find("#host_vcenter_address"), $thisDialog.find("#host_vcenter_address_errormsg"));
isValid &= validateString("vCenter User", $thisDialog.find("#host_vcenter_username"), $thisDialog.find("#host_vcenter_username_errormsg"));
isValid &= validateString("vCenter Password", $thisDialog.find("#host_vcenter_password"), $thisDialog.find("#host_vcenter_password_errormsg"));
@@ -944,7 +944,7 @@ function initAddHostShortcut() {
var clustertype = clusterObj.clustertype;
array1.push("&clustertype=" + clustertype);
- if(hypervisor == "VmWare") {
+ if(hypervisor == "VMware") {
var username = trim($thisDialog.find("#host_vcenter_username").val());
array1.push("&username="+todb(username));
@@ -1714,7 +1714,7 @@ function initAddPrimaryStorageShortcut($midmenuAddLink2, currentPageInRightPanel
$protocolSelector.empty();
$protocolSelector.append('');
$protocolSelector.append('');
- } else if(objCluster.hypervisortype == "VmWare") {
+ } else if(objCluster.hypervisortype == "VMware") {
$protocolSelector.empty();
$protocolSelector.append('');
$protocolSelector.append('');
diff --git a/ui/scripts/cloud.core.template.js b/ui/scripts/cloud.core.template.js
index d6b99f5b33e..a8f5e55c671 100644
--- a/ui/scripts/cloud.core.template.js
+++ b/ui/scripts/cloud.core.template.js
@@ -75,7 +75,7 @@ function afterLoadTemplateJSP() {
if(selectedHypervisorType == "XenServer")
formatSelect.append("");
- else if(selectedHypervisorType == "VmWare")
+ else if(selectedHypervisorType == "VMware")
formatSelect.append("");
else if(selectedHypervisorType == "KVM")
formatSelect.append("");
diff --git a/ui/scripts/cloud.core.zone.js b/ui/scripts/cloud.core.zone.js
index 03a371c2c42..ae2ccc71621 100644
--- a/ui/scripts/cloud.core.zone.js
+++ b/ui/scripts/cloud.core.zone.js
@@ -523,7 +523,7 @@ function bindAddClusterButtonOnZonePage($button, zoneId, zoneName) {
});
$dialogAddCluster.find("#cluster_hypervisor").change(function() {
- if($(this).val() == "VmWare") {
+ if($(this).val() == "VMware") {
$('li[input_group="vmware"]', $dialogAddCluster).show();
$dialogAddCluster.find("#type_dropdown").change();
} else {
@@ -549,12 +549,12 @@ function bindAddClusterButtonOnZonePage($button, zoneId, zoneName) {
// validate values
var hypervisor = $thisDialog.find("#cluster_hypervisor").val();
var clusterType="CloudManaged";
- if(hypervisor == "VmWare")
+ if(hypervisor == "VMware")
clusterType = $thisDialog.find("#type_dropdown").val();
var isValid = true;
isValid &= validateDropDownBox("Pod", $thisDialog.find("#pod_dropdown"), $thisDialog.find("#pod_dropdown_errormsg"));
- if(hypervisor == "VmWare" && clusterType != "CloudManaged") {
+ if(hypervisor == "VMware" && clusterType != "CloudManaged") {
isValid &= validateString("vCenter Server", $thisDialog.find("#cluster_hostname"), $thisDialog.find("#cluster_hostname_errormsg"));
isValid &= validateString("vCenter user", $thisDialog.find("#cluster_username"), $thisDialog.find("#cluster_username_errormsg"));
isValid &= validateString("Password", $thisDialog.find("#cluster_password"), $thisDialog.find("#cluster_password_errormsg"));
@@ -580,7 +580,7 @@ function bindAddClusterButtonOnZonePage($button, zoneId, zoneName) {
array1.push("&podId="+podId);
var clusterName = trim($thisDialog.find("#cluster_name").val());
- if(hypervisor == "VmWare" && clusterType != "CloudManaged") {
+ if(hypervisor == "VMware" && clusterType != "CloudManaged") {
var username = trim($thisDialog.find("#cluster_username").val());
array1.push("&username="+todb(username));
@@ -675,7 +675,7 @@ function bindAddHostButtonOnZonePage($button, zoneId, zoneName) {
if(clusterId == null)
return;
var clusterObj = clustersUnderOnePod[clusterId];
- if(clusterObj.hypervisortype == "VmWare") {
+ if(clusterObj.hypervisortype == "VMware") {
$('li[input_group="vmware"]', $dialogAddHost).show();
$('li[input_group="general"]', $dialogAddHost).hide();
} else {
@@ -708,7 +708,7 @@ function bindAddHostButtonOnZonePage($button, zoneId, zoneName) {
if(clusterId != null) {
clusterObj = clustersUnderOnePod[clusterId];
hypervisor = clusterObj.hypervisortype;
- if(hypervisor == "VmWare") {
+ if(hypervisor == "VMware") {
isValid &= validateString("vCenter Address", $thisDialog.find("#host_vcenter_address"), $thisDialog.find("#host_vcenter_address_errormsg"));
isValid &= validateString("vCenter User", $thisDialog.find("#host_vcenter_username"), $thisDialog.find("#host_vcenter_username_errormsg"));
isValid &= validateString("vCenter Password", $thisDialog.find("#host_vcenter_password"), $thisDialog.find("#host_vcenter_password_errormsg"));
@@ -744,7 +744,7 @@ function bindAddHostButtonOnZonePage($button, zoneId, zoneName) {
var clustertype = clusterObj.clustertype;
array1.push("&clustertype=" + clustertype);
- if(hypervisor == "VmWare") {
+ if(hypervisor == "VMware") {
var username = trim($thisDialog.find("#host_vcenter_username").val());
array1.push("&username="+todb(username));
@@ -860,7 +860,7 @@ function bindAddPrimaryStorageButtonOnZonePage($button, zoneId, zoneName) {
$protocolSelector.empty();
$protocolSelector.append('');
$protocolSelector.append('');
- } else if(objCluster.hypervisortype == "VmWare") {
+ } else if(objCluster.hypervisortype == "VMware") {
$protocolSelector.empty();
$protocolSelector.append('');
$protocolSelector.append('');