AMBARI-1600. Make component naming consistent. (yusaku)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1456256 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -458,6 +458,8 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-1600. Make component naming consistent. (yusaku)
+
  AMBARI-1625. Oozie start fails on secure cluster. (swagle)
 
  AMBARI-1592. Fix configuration propagation.

ambari-web/app/controllers/wizard/step8_controller.js

@@ -494,7 +494,7 @@ App.WizardStep8Controller = Em.Controller.extend({
   },
 
   loadDnValue: function (dnComponent) {
-    var dnHosts = this.get('content.slaveComponentHosts').findProperty('displayName', 'Datanode');
+    var dnHosts = this.get('content.slaveComponentHosts').findProperty('displayName', 'DataNode');
     var totalDnHosts = dnHosts.hosts.length;
     /* var totalGroups = this.get('slaveComponentConfig.components').findProperty('componentName', 'DATANODE').groups.length;
      var groupLabel;
@@ -597,7 +597,7 @@ App.WizardStep8Controller = Em.Controller.extend({
         case 'Master':
           this.loadMasterValue(_component);
           break;
-        case 'Region Servers':
+        case 'RegionServers':
           this.loadRegionServerValue(_component);
           break;
         default:
@@ -616,7 +616,7 @@ App.WizardStep8Controller = Em.Controller.extend({
   },
 
   loadRegionServerValue: function (rsComponent) {
-    var rsHosts = this.get('content.slaveComponentHosts').findProperty('displayName', 'HBaseRegionServer');
+    var rsHosts = this.get('content.slaveComponentHosts').findProperty('displayName', 'RegionServer');
     var totalRsHosts = rsHosts.hosts.length;
     /* var totalGroups = this.get('slaveComponentConfig.components').findProperty('componentName', 'HBASE_REGIONSERVER').groups.length;
      var groupLabel;

ambari-web/app/data/config_properties.js

@@ -120,8 +120,8 @@ module.exports =
     {
       "id": "puppet var",
       "name": "hbase_regionserver_heapsize",
-      "displayName": "HBase Region Servers maximum Java heap size",
-      "description": "Maximum Java heap size for HBase Region Servers (Java option -Xmx)",
+      "displayName": "HBase RegionServers maximum Java heap size",
+      "description": "Maximum Java heap size for HBase RegionServers (Java option -Xmx)",
       "defaultValue": "1024",
       "displayType": "int",
       "unit": "MB",
@@ -180,7 +180,7 @@ module.exports =
     {
       "id": "puppet var",
       "name": "regionserver_handlers",
-      "displayName": "HBase Region Server Handler",
+      "displayName": "HBase RegionServer Handler",
       "description": "Count of RPC Listener instances spun up on RegionServers",
       "defaultValue": "30",
       "displayType": "int",

ambari-web/app/data/review_configs.js

@@ -97,7 +97,7 @@ module.exports = [
             component_value: ''
           }),
           Ember.Object.create({
-            display_name: 'Region Servers',
+            display_name: 'RegionServers',
             component_value: ''
           })
         ]

ambari-web/app/data/service_components.js

@@ -37,7 +37,7 @@ module.exports = new Ember.Set([
   {
     service_name: 'HDFS',
     component_name: 'DATANODE',
-    display_name: 'Datanode',
+    display_name: 'DataNode',
     isMaster: false,
     isClient: false,
     description: 'The slave for HDFS'
@@ -101,7 +101,7 @@ module.exports = new Ember.Set([
   {
     service_name: 'HBASE',
     component_name: 'HBASE_REGIONSERVER',
-    display_name: 'HBase Region Server',
+    display_name: 'RegionServer',
     isMaster: false,
     isClient: false,
     description: 'The slave for HBase'

ambari-web/app/messages.js

@@ -574,7 +574,7 @@ Em.I18n.translations = {
   'services.service.summary.tasksMaps':'Tasks: Maps',
   'services.service.summary.tasksReduces':'Tasks: Reduces',
   'services.service.summary.hbaseMaster':'HBase Master Web UI',
-  'services.service.summary.regionServerCount':'Region Server Count',
+  'services.service.summary.regionServerCount':'RegionServer Count',
   'services.service.summary.regionInTransition':'Region In Transition',
   'services.service.summary.masterStarted':'Master Started',
   'services.service.summary.masterActivated':'Master Activated',
@@ -870,8 +870,8 @@ Em.I18n.translations = {
   'dashboard.services.hbase.masterServerHeap.summary':'{0} / {1} ({2}% used)',
   'dashboard.services.hbase.masterServerUptime':'Master Server Uptime',
   'dashboard.services.hbase.averageLoad':'Average Load',
-  'dashboard.services.hbase.averageLoadPerServer':'{0} regions per Region Server',
-  'dashboard.services.hbase.regionServers':'Region Servers',
+  'dashboard.services.hbase.averageLoadPerServer':'{0} regions per RegionServer',
+  'dashboard.services.hbase.regionServers':'RegionServers',
   'dashboard.services.hbase.regionServersSummary':'{0} live / {1} total',
   'dashboard.services.hbase.chart.label':'Request Count',
   'dashboard.services.hbase.version':'Version',