You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2013/03/14 00:11:36 UTC
svn commit: r1456256 - in /incubator/ambari/trunk: ./ ambari-web/app/
ambari-web/app/controllers/wizard/ ambari-web/app/data/
Author: yusaku
Date: Wed Mar 13 23:11:33 2013
New Revision: 1456256
URL: http://svn.apache.org/r1456256
Log:
AMBARI-1600. Make component naming consistent. (yusaku)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js
incubator/ambari/trunk/ambari-web/app/data/config_properties.js
incubator/ambari/trunk/ambari-web/app/data/review_configs.js
incubator/ambari/trunk/ambari-web/app/data/service_components.js
incubator/ambari/trunk/ambari-web/app/messages.js
Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1456256&r1=1456255&r2=1456256&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Wed Mar 13 23:11:33 2013
@@ -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.
Modified: incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js?rev=1456256&r1=1456255&r2=1456256&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js Wed Mar 13 23:11:33 2013
@@ -494,7 +494,7 @@ App.WizardStep8Controller = Em.Controlle
},
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.Controlle
case 'Master':
this.loadMasterValue(_component);
break;
- case 'Region Servers':
+ case 'RegionServers':
this.loadRegionServerValue(_component);
break;
default:
@@ -616,7 +616,7 @@ App.WizardStep8Controller = Em.Controlle
},
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;
Modified: incubator/ambari/trunk/ambari-web/app/data/config_properties.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/data/config_properties.js?rev=1456256&r1=1456255&r2=1456256&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/data/config_properties.js (original)
+++ incubator/ambari/trunk/ambari-web/app/data/config_properties.js Wed Mar 13 23:11:33 2013
@@ -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",
Modified: incubator/ambari/trunk/ambari-web/app/data/review_configs.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/data/review_configs.js?rev=1456256&r1=1456255&r2=1456256&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/data/review_configs.js (original)
+++ incubator/ambari/trunk/ambari-web/app/data/review_configs.js Wed Mar 13 23:11:33 2013
@@ -97,7 +97,7 @@ module.exports = [
component_value: ''
}),
Ember.Object.create({
- display_name: 'Region Servers',
+ display_name: 'RegionServers',
component_value: ''
})
]
Modified: incubator/ambari/trunk/ambari-web/app/data/service_components.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/data/service_components.js?rev=1456256&r1=1456255&r2=1456256&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/data/service_components.js (original)
+++ incubator/ambari/trunk/ambari-web/app/data/service_components.js Wed Mar 13 23:11:33 2013
@@ -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'
Modified: incubator/ambari/trunk/ambari-web/app/messages.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/messages.js?rev=1456256&r1=1456255&r2=1456256&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/messages.js (original)
+++ incubator/ambari/trunk/ambari-web/app/messages.js Wed Mar 13 23:11:33 2013
@@ -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',