AMBARI-2273. Display "Hive" rather than "Hive/HCat" as the service display name. (Oleg Nechiporenko via yusaku)

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

ambari-web/app/data/secure_configs.js

@@ -60,7 +60,7 @@ module.exports = [
 
   {
     serviceName: 'HIVE',
-    displayName: 'Hive/HCat',
+    displayName: 'Hive',
     filename: 'hive-site',
     configCategories: [
       App.ServiceConfigCategory.create({ name: 'Hive Metastore', displayName: 'Hive Metastore'})

ambari-web/app/data/service_configs.js

@@ -86,7 +86,7 @@ module.exports = [
 
   {
     serviceName: 'HIVE',
-    displayName: 'Hive/HCat',
+    displayName: 'Hive',
     filename: 'hive-site',
     configCategories: [
       App.ServiceConfigCategory.create({ name: 'Hive Metastore', displayName : 'Hive Metastore'}),

ambari-web/app/models/service.js

@@ -154,7 +154,7 @@ App.Service = DS.Model.extend({
       case 'oozie':
         return 'Oozie';
       case 'hive':
-        return 'Hive/HCat';
+        return 'Hive';
       case 'hcatalog':
         return 'HCat';
       case 'zookeeper':

ambari-web/test/utils/host_progress_popup_test.js

@@ -50,7 +50,7 @@ describe('App.HostPopup', function () {
       isRunning: false
     },
     {
-      displayName: "Start service Hive/HCat",
+      displayName: "Start service Hive",
       hosts: [
         {
           logTasks: [
@@ -65,7 +65,7 @@ describe('App.HostPopup', function () {
           ],
           name: "ip-10-12-123-90.ec2.internal",
           publicName: "ip-10-12-123-90.ec2.internal",
-          serviceName: "Start service Hive/HCat"
+          serviceName: "Start service Hive"
         },
         {
           logTasks: [
@@ -88,7 +88,7 @@ describe('App.HostPopup', function () {
           ],
           name: "ip-10-33-7-23.ec2.internal",
           publicName: "ip-10-33-7-23.ec2.internal",
-          serviceName: "Start service Hive/HCat"
+          serviceName: "Start service Hive"
         }
       ],
       isRunning: false