瀏覽代碼

AMBARI-7963. Remove experimental flag for the features that are already part of ambari. (jaimin)

Jaimin Jetly 10 年之前
父節點
當前提交
33ed5921d6
共有 80 個文件被更改,包括 633 次插入4535 次删除
  1. 0 3
      ambari-web/app/assets/data/clusters/cluster.json
  2. 0 3
      ambari-web/app/assets/data/clusters/tags_and_groups.json
  3. 0 37
      ambari-web/app/assets/data/configurations/cluster_level_configs.json
  4. 0 178
      ambari-web/app/assets/data/dashboard/services.json
  5. 0 8
      ambari-web/app/assets/data/hosts/hosts.json
  6. 0 72
      ambari-web/app/assets/data/services/host_component_actual_configs.json
  7. 0 353
      ambari-web/app/assets/data/wizard/stack/hdp/version1.3.0/HUE.json
  8. 0 280
      ambari-web/app/assets/data/wizard/stack/hdp/version1.3.0/global.json
  9. 0 353
      ambari-web/app/assets/data/wizard/stack/hdp/version131/HUE.json
  10. 0 280
      ambari-web/app/assets/data/wizard/stack/hdp/version131/global.json
  11. 0 353
      ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/HUE.json
  12. 0 280
      ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/global.json
  13. 0 22
      ambari-web/app/assets/data/wizard/stack/stacks.json
  14. 0 3
      ambari-web/app/assets/test/tests.js
  15. 1 31
      ambari-web/app/config.js
  16. 0 5
      ambari-web/app/controllers.js
  17. 2 6
      ambari-web/app/controllers/global/cluster_controller.js
  18. 1 3
      ambari-web/app/controllers/global/update_controller.js
  19. 0 1
      ambari-web/app/controllers/main/admin/repositories.js
  20. 0 3
      ambari-web/app/controllers/main/host/details.js
  21. 0 3
      ambari-web/app/controllers/main/service.js
  22. 65 134
      ambari-web/app/controllers/main/service/info/configs.js
  23. 1 1
      ambari-web/app/controllers/wizard.js
  24. 3 161
      ambari-web/app/controllers/wizard/step5_controller.js
  25. 26 149
      ambari-web/app/controllers/wizard/step6_controller.js
  26. 34 49
      ambari-web/app/controllers/wizard/step7_controller.js
  27. 2 5
      ambari-web/app/controllers/wizard/step8_controller.js
  28. 4 14
      ambari-web/app/data/BIGTOP/site_properties.js
  29. 4 14
      ambari-web/app/data/HDP2/site_properties.js
  30. 3 53
      ambari-web/app/data/site_properties.js
  31. 1 2
      ambari-web/app/mappers/service_metrics_mapper.js
  32. 14 17
      ambari-web/app/mappers/stack_service_mapper.js
  33. 0 4
      ambari-web/app/messages.js
  34. 5 9
      ambari-web/app/mixins/common/serverValidator.js
  35. 0 2
      ambari-web/app/models.js
  36. 0 7
      ambari-web/app/models/quick_links.js
  37. 0 13
      ambari-web/app/models/service_config.js
  38. 1 2
      ambari-web/app/models/stack_service.js
  39. 0 35
      ambari-web/app/models/stack_service_component.js
  40. 1 1
      ambari-web/app/models/user.js
  41. 1 5
      ambari-web/app/routes/add_host_routes.js
  42. 1 3
      ambari-web/app/routes/add_service_routes.js
  43. 1 3
      ambari-web/app/routes/installer.js
  44. 2 6
      ambari-web/app/routes/main.js
  45. 0 101
      ambari-web/app/templates/common/configs/capacity_scheduler.hbs
  46. 2 6
      ambari-web/app/templates/common/configs/service_config.hbs
  47. 5 5
      ambari-web/app/templates/common/configs/service_config_category.hbs
  48. 126 118
      ambari-web/app/templates/common/host_progress_popup.hbs
  49. 1 3
      ambari-web/app/templates/main/host/add.hbs
  50. 53 53
      ambari-web/app/templates/main/host/details.hbs
  51. 0 4
      ambari-web/app/templates/main/service/all_services_actions.hbs
  52. 25 20
      ambari-web/app/templates/main/service/info/configs.hbs
  53. 64 55
      ambari-web/app/templates/main/service/info/summary.hbs
  54. 80 81
      ambari-web/app/templates/wizard/step1.hbs
  55. 0 16
      ambari-web/app/templates/wizard/step2.hbs
  56. 18 75
      ambari-web/app/utils/config.js
  57. 12 18
      ambari-web/app/utils/host_progress_popup.js
  58. 0 5
      ambari-web/app/views.js
  59. 3 709
      ambari-web/app/views/common/configs/services_config.js
  60. 9 12
      ambari-web/app/views/common/quick_view_link_view.js
  61. 5 7
      ambari-web/app/views/main/admin.js
  62. 17 21
      ambari-web/app/views/main/dashboard.js
  63. 3 14
      ambari-web/app/views/main/dashboard/widgets/hbase_links.js
  64. 1 1
      ambari-web/app/views/main/host/details/host_component_view.js
  65. 10 11
      ambari-web/app/views/main/host/menu.js
  66. 0 3
      ambari-web/app/views/main/host/summary.js
  67. 5 7
      ambari-web/app/views/main/menu.js
  68. 2 2
      ambari-web/app/views/main/service/item.js
  69. 3 14
      ambari-web/app/views/main/service/services/hbase.js
  70. 9 9
      ambari-web/app/views/wizard/controls_view.js
  71. 1 9
      ambari-web/test/controllers/global/update_controller_test.js
  72. 0 5
      ambari-web/test/controllers/main/host/details_test.js
  73. 1 10
      ambari-web/test/controllers/main/service/info/config_test.js
  74. 0 61
      ambari-web/test/controllers/main/service_test.js
  75. 0 51
      ambari-web/test/controllers/wizard/step6_test.js
  76. 3 35
      ambari-web/test/controllers/wizard/step7_test.js
  77. 1 1
      ambari-web/test/controllers/wizard/step9_test.js
  78. 0 8
      ambari-web/test/models/stack_service_component_test.js
  79. 1 4
      ambari-web/test/models/user_test.js
  80. 0 15
      ambari-web/test/views/common/configs/services_config_test.js

+ 0 - 3
ambari-web/app/assets/data/clusters/cluster.json

@@ -29,9 +29,6 @@
       "hive-site" : {
         "tag" : "version1"
       },
-      "hue-site" : {
-        "tag" : "version1"
-      },
       "storm-site" : {
         "tag" : "version1"
       },

+ 0 - 3
ambari-web/app/assets/data/clusters/tags_and_groups.json

@@ -29,9 +29,6 @@
       "hive-site" : {
         "tag" : "version1"
       },
-      "hue-site" : {
-        "tag" : "version1"
-      },
       "capacity-scheduler" : {
         "tag" : "version1"
       },

+ 0 - 37
ambari-web/app/assets/data/configurations/cluster_level_configs.json

@@ -362,43 +362,6 @@
         "hbase.zookeeper.quorum" : "dev.hortonworks.com"
       }
     },
-    {
-      "href" : "http://ec2-23-20-184-220.compute-1.amazonaws.com:8080/api/v1/clusters/tdk/configurations?type=hue-site&tag=version1",
-      "tag" : "version1",
-      "type" : "hue-site",
-      "Config" : {
-        "cluster_name" : "tdk"
-      },
-      "properties" : {
-        "hadoop_mapred_home" : "/usr/lib/hadoop/lib",
-        "smtp_host" : "localhost",
-        "use_cherrypy_server" : "false",
-        "hbase_shell_command" : "/usr/bin/hbase shell",
-        "db_name" : "sandbox",
-        "db_password" : "1111",
-        "send_debug_messages" : "1",
-        "http_host" : "0.0.0.0",
-        "django_debug_mode" : "1",
-        "pig_shell_command" : "/usr/bin/pig -l /dev/null",
-        "http_port" : "8000",
-        "db_engine" : "mysql",
-        "whitelist" : "(localhost|127\\.0\\.0\\.1):(50030|50070|50060|50075|50111)",
-        "hbase_nice_name" : "HBase Shell",
-        "backend_auth_policy" : "desktop.auth.backend.AllowAllBackend",
-        "smtp_password" : "25",
-        "default_from_email" : "sandbox@hortonworks.com",
-        "tls" : "no",
-        "db_user" : "sandbox",
-        "db_host" : "localhost",
-        "database_logging" : "0",
-        "smtp_port" : "25",
-        "time_zone" : "America/Los_Angeles",
-        "bash_shell_command" : "/bin/bash",
-        "http_500_debug_mode" : "1",
-        "db_port" : "3306",
-        "jobtracker_port" : "50030"
-      }
-    },
     {
       "href" : "http://dev.hortonworks.com:8080/api/v1/clusters/vmc/configurations?type=global&tag=version1",
       "tag" : "version1",

+ 0 - 178
ambari-web/app/assets/data/dashboard/services.json

@@ -985,184 +985,6 @@
         }
       ]
     },
-    {
-      "href" : "http://ec2-23-20-184-220.compute-1.amazonaws.com:8080/api/v1/clusters/tdk/services/HUE",
-      "ServiceInfo" : {
-        "cluster_name" : "tdk",
-        "service_name" : "HUE"
-      },
-      "components" : [
-        {
-          "href" : "http://ec2-23-20-184-220.compute-1.amazonaws.com:8080/api/v1/clusters/tdk/services/HUE/components/HUE_SERVER",
-          "ServiceComponentInfo" : {
-            "cluster_name" : "tdk",
-            "state" : "INSTALLED",
-            "component_name" : "HUE_SERVER",
-            "service_name" : "HUE",
-            "desired_configs" : { }
-          },
-          "host_components" : [
-            {
-              "href" : "http://ec2-23-20-184-220.compute-1.amazonaws.com:8080/api/v1/clusters/tdk/hosts/ip-10-147-169-187.ec2.internal/host_components/HUE_SERVER",
-              "HostRoles" : {
-                "cluster_name" : "tdk",
-                "ha_status" : "passive",
-                "desired_state" : "INSTALLED",
-                "state" : "STARTED",
-                "component_name" : "HUE_SERVER",
-                "service_name" : "HUE",
-                "host_name" : "ip-10-147-169-187.ec2.internal",
-                "configs" : { },
-                "desired_configs" : { }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "href" : "http://ec2-23-20-184-220.compute-1.amazonaws.com:8080/api/v1/clusters/tdk/services/HUE",
-      "ServiceInfo" : {
-        "cluster_name" : "tdk",
-        "service_name" : "HUE"
-      },
-      "components" : [
-        {
-          "href" : "http://ec2-23-20-184-220.compute-1.amazonaws.com:8080/api/v1/clusters/tdk/services/HUE/components/HUE_SERVER",
-          "ServiceComponentInfo" : {
-            "cluster_name" : "tdk",
-            "state" : "INSTALLED",
-            "component_name" : "HUE_SERVER",
-            "service_name" : "HUE",
-            "desired_configs" : { }
-          },
-          "host_components" : [
-            {
-              "href" : "http://ec2-23-20-184-220.compute-1.amazonaws.com:8080/api/v1/clusters/tdk/hosts/ip-10-147-169-187.ec2.internal/host_components/HUE_SERVER",
-              "HostRoles" : {
-                "cluster_name" : "tdk",
-                "ha_status" : "passive",
-                "desired_state" : "INSTALLED",
-                "state" : "STARTED",
-                "component_name" : "HUE_SERVER",
-                "service_name" : "HUE",
-                "host_name" : "ip-10-147-169-187.ec2.internal",
-                "configs" : { },
-                "desired_configs" : { }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/services/HUE",
-      "ServiceInfo" : {
-        "cluster_name" : "cl1",
-        "service_name" : "HUE"
-      },
-      "components" : [
-        {
-          "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/services/HUE/components/HUE_SERVER",
-          "ServiceComponentInfo" : {
-            "cluster_name" : "cl1",
-            "desired_configs" : { },
-            "state" : "STARTED",
-            "component_name" : "HUE_SERVER",
-            "service_name" : "HUE"
-          },
-          "host_components" : [
-            {
-              "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/hosts/domU-12-31-39-0E-E6-01.compute-1.internal/host_components/HUE_SERVER",
-              "HostRoles" : {
-                "configs" : {
-                  "global" : "version1",
-                  "hue-site" : "version1"
-                },
-                "cluster_name" : "cl1",
-                "desired_configs" : { },
-                "desired_state" : "STARTED",
-                "state" : "STARTED",
-                "component_name" : "HUE_SERVER",
-                "host_name" : "domU-12-31-39-0E-E6-01.compute-1.internal"
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/services/HUE",
-      "ServiceInfo" : {
-        "cluster_name" : "cl1",
-        "service_name" : "HUE"
-      },
-      "components" : [
-        {
-          "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/services/HUE/components/HUE_SERVER",
-          "ServiceComponentInfo" : {
-            "cluster_name" : "cl1",
-            "desired_configs" : { },
-            "state" : "STARTED",
-            "component_name" : "HUE_SERVER",
-            "service_name" : "HUE"
-          },
-          "host_components" : [
-            {
-              "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/hosts/domU-12-31-39-0E-E6-01.compute-1.internal/host_components/HUE_SERVER",
-              "HostRoles" : {
-                "configs" : {
-                  "global" : "version1",
-                  "hue-site" : "version1"
-                },
-                "cluster_name" : "cl1",
-                "desired_configs" : { },
-                "desired_state" : "STARTED",
-                "state" : "STARTED",
-                "component_name" : "HUE_SERVER",
-                "host_name" : "domU-12-31-39-0E-E6-01.compute-1.internal"
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/services/HUE",
-      "ServiceInfo" : {
-        "cluster_name" : "cl1",
-        "service_name" : "HUE"
-      },
-      "components" : [
-        {
-          "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/services/HUE/components/HUE_SERVER",
-          "ServiceComponentInfo" : {
-            "cluster_name" : "cl1",
-            "desired_configs" : { },
-            "state" : "STARTED",
-            "component_name" : "HUE_SERVER",
-            "service_name" : "HUE"
-          },
-          "host_components" : [
-            {
-              "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/hosts/domU-12-31-39-0E-E6-01.compute-1.internal/host_components/HUE_SERVER",
-              "HostRoles" : {
-                "configs" : {
-                  "global" : "version1",
-                  "hue-site" : "version1"
-                },
-                "cluster_name" : "cl1",
-                "desired_configs" : { },
-                "desired_state" : "STARTED",
-                "state" : "STARTED",
-                "component_name" : "HUE_SERVER",
-                "host_name" : "domU-12-31-39-0E-E6-01.compute-1.internal"
-              }
-            }
-          ]
-        }
-      ]
-    },
     {
       "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/services/PIG",
       "ServiceInfo" : {

+ 0 - 8
ambari-web/app/assets/data/hosts/hosts.json

@@ -1324,14 +1324,6 @@
             "component_name" : "HBASE_REGIONSERVER",
             "host_name" : "domU-12-31-39-0E-E6-01.compute-1.internal"
           }
-        },
-        {
-          "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/hosts/domU-12-31-39-0E-E6-01.compute-1.internal/host_components/HUE_SERVER",
-          "HostRoles" : {
-            "cluster_name" : "cl1",
-            "component_name" : "HUE_SERVER",
-            "host_name" : "domU-12-31-39-0E-E6-01.compute-1.internal"
-          }
         }
       ]
     }

+ 0 - 72
ambari-web/app/assets/data/services/host_component_actual_configs.json

@@ -1043,78 +1043,6 @@
         }
       ]
     },
-    {
-      "href" : "http://ec2-23-20-184-220.compute-1.amazonaws.com:8080/api/v1/clusters/tdk/services/HUE",
-      "ServiceInfo" : {
-        "cluster_name" : "tdk",
-        "service_name" : "HUE"
-      },
-      "components" : [
-        {
-          "href" : "http://ec2-23-20-184-220.compute-1.amazonaws.com:8080/api/v1/clusters/tdk/services/HUE/components/HUE_SERVER",
-          "ServiceComponentInfo" : {
-            "cluster_name" : "tdk",
-            "state" : "INSTALLED",
-            "component_name" : "HUE_SERVER",
-            "service_name" : "HUE",
-            "desired_configs" : { }
-          },
-          "host_components" : [
-            {
-              "href" : "http://ec2-23-20-184-220.compute-1.amazonaws.com:8080/api/v1/clusters/tdk/hosts/ip-10-147-169-187.ec2.internal/host_components/HUE_SERVER",
-              "HostRoles" : {
-                "cluster_name" : "tdk",
-                "ha_status" : "passive",
-                "desired_state" : "INSTALLED",
-                "state" : "St",
-                "component_name" : "HUE_SERVER",
-                "service_name" : "HUE",
-                "host_name" : "ip-10-147-169-187.ec2.internal",
-                "configs" : { },
-                "desired_configs" : { }
-              }
-            }
-          ]
-        }
-      ]
-    },
-
-    {
-      "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/services/HUE",
-      "ServiceInfo" : {
-        "cluster_name" : "cl1",
-        "service_name" : "HUE"
-      },
-      "components" : [
-        {
-          "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/services/HUE/components/HUE_SERVER",
-          "ServiceComponentInfo" : {
-            "cluster_name" : "cl1",
-            "desired_configs" : { },
-            "state" : "STARTED",
-            "component_name" : "HUE_SERVER",
-            "service_name" : "HUE"
-          },
-          "host_components" : [
-            {
-              "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/hosts/domU-12-31-39-0E-E6-01.compute-1.internal/host_components/HUE_SERVER",
-              "HostRoles" : {
-                "configs" : {
-                  "global" : "version1",
-                  "hue-site" : "version1"
-                },
-                "cluster_name" : "cl1",
-                "desired_configs" : { },
-                "desired_state" : "STARTED",
-                "state" : "STARTED",
-                "component_name" : "HUE_SERVER",
-                "host_name" : "domU-12-31-39-0E-E6-01.compute-1.internal"
-              }
-            }
-          ]
-        }
-      ]
-    },
     {
       "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/services/PIG",
       "ServiceInfo" : {

+ 0 - 353
ambari-web/app/assets/data/wizard/stack/hdp/version1.3.0/HUE.json

@@ -1,353 +0,0 @@
-{
-  "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations?fields=*",
-  "items" : [
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/pig_shell_command",
-      "StackConfigurations" : {
-        "property_description" : "Define and configure a new shell type pig.",
-        "property_value" : "/usr/bin/pig -l /dev/null",
-        "stack_version" : "1.3.0",
-        "property_name" : "pig_shell_command",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_name",
-      "StackConfigurations" : {
-        "property_description" : "Configuration options for specifying the Desktop Database.",
-        "property_value" : "sandbox",
-        "stack_version" : "1.3.0",
-        "property_name" : "db_name",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_user",
-      "StackConfigurations" : {
-        "property_description" : "Configuration options for specifying the Desktop Database.",
-        "property_value" : "sandbox",
-        "stack_version" : "1.3.0",
-        "property_name" : "db_user",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_host",
-      "StackConfigurations" : {
-        "property_description" : "Configuration options for specifying the Desktop Database.",
-        "property_value" : "localhost",
-        "stack_version" : "1.3.0",
-        "property_name" : "db_host",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_password",
-      "StackConfigurations" : {
-        "property_description" : "Configuration options for specifying the Desktop Database.",
-        "property_value" : "1111",
-        "stack_version" : "1.3.0",
-        "property_name" : "db_password",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/time_zone",
-      "StackConfigurations" : {
-        "property_description" : "Time zone name",
-        "property_value" : "America/Los_Angeles",
-        "stack_version" : "1.3.0",
-        "property_name" : "time_zone",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/http_host",
-      "StackConfigurations" : {
-        "property_description" : "Webserver listens on this address and port",
-        "property_value" : "0.0.0.0",
-        "stack_version" : "1.3.0",
-        "property_name" : "http_host",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/hue_pid_dir",
-      "StackConfigurations" : {
-        "property_description" : "Hue Pid Dir.",
-        "property_value" : "/var/run/hue",
-        "stack_version" : "1.3.0",
-        "property_name" : "hue_pid_dir",
-        "service_name" : "HUE",
-        "type" : "global.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/tls",
-      "StackConfigurations" : {
-        "property_description" : "Whether to use a TLS (secure) connection when talking to the SMTP server.",
-        "property_value" : "no",
-        "stack_version" : "1.3.0",
-        "property_name" : "tls",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/hadoop_mapred_home",
-      "StackConfigurations" : {
-        "property_description" : "The SMTP server information for email notification delivery.",
-        "property_value" : "/usr/lib/hadoop/lib",
-        "stack_version" : "1.3.0",
-        "property_name" : "hadoop_mapred_home",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/default_from_email",
-      "StackConfigurations" : {
-        "property_description" : "The SMTP server information for email notification delivery.",
-        "property_value" : "sandbox@hortonworks.com",
-        "stack_version" : "1.3.0",
-        "property_name" : "default_from_email",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/backend_auth_policy",
-      "StackConfigurations" : {
-        "property_description" : "Authentication backend.",
-        "property_value" : "desktop.auth.backend.AllowAllBackend",
-        "stack_version" : "1.3.0",
-        "property_name" : "backend_auth_policy",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/hue_log_dir",
-      "StackConfigurations" : {
-        "property_description" : "Hue Log Dir.",
-        "property_value" : "/var/log/hue",
-        "stack_version" : "1.3.0",
-        "property_name" : "hue_log_dir",
-        "service_name" : "HUE",
-        "type" : "global.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/whitelist",
-      "StackConfigurations" : {
-        "property_description" : "proxy settings",
-        "property_value" : "(localhost|127\\.0\\.0\\.1):(50030|50070|50060|50075|50111)",
-        "stack_version" : "1.3.0",
-        "property_name" : "whitelist",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/jobtracker_port",
-      "StackConfigurations" : {
-        "property_description" : "The port where the JobTracker IPC listens on.",
-        "property_value" : "50030",
-        "stack_version" : "1.3.0",
-        "property_name" : "jobtracker_port",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_port",
-      "StackConfigurations" : {
-        "property_description" : "Configuration options for specifying the Desktop Database.",
-        "property_value" : "3306",
-        "stack_version" : "1.3.0",
-        "property_name" : "db_port",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/smtp_port",
-      "StackConfigurations" : {
-        "property_description" : "The SMTP server information for email notification delivery.",
-        "property_value" : "25",
-        "stack_version" : "1.3.0",
-        "property_name" : "smtp_port",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/database_logging",
-      "StackConfigurations" : {
-        "property_description" : "To show database transactions, set database_logging to 1.\n      default, database_logging=0",
-        "property_value" : "0",
-        "stack_version" : "1.3.0",
-        "property_name" : "database_logging",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/send_debug_messages",
-      "StackConfigurations" : {
-        "property_description" : null,
-        "property_value" : "1",
-        "stack_version" : "1.3.0",
-        "property_name" : "send_debug_messages",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/smtp_password",
-      "StackConfigurations" : {
-        "property_description" : "The SMTP server information for email notification delivery.",
-        "property_value" : "25",
-        "stack_version" : "1.3.0",
-        "property_name" : "smtp_password",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/django_debug_mode",
-      "StackConfigurations" : {
-        "property_description" : "Turn off debug",
-        "property_value" : "1",
-        "stack_version" : "1.3.0",
-        "property_name" : "django_debug_mode",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/use_cherrypy_server",
-      "StackConfigurations" : {
-        "property_description" : "Set to true to use CherryPy as the webserver, set to false\n      to use Spawning as the webserver. Defaults to Spawning if\n      key is not specified.",
-        "property_value" : "false",
-        "stack_version" : "1.3.0",
-        "property_name" : "use_cherrypy_server",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/hbase_shell_command",
-      "StackConfigurations" : {
-        "property_description" : "Define and configure a new shell type hbase.",
-        "property_value" : "/usr/bin/hbase shell",
-        "stack_version" : "1.3.0",
-        "property_name" : "hbase_shell_command",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/bash_shell_command",
-      "StackConfigurations" : {
-        "property_description" : "Define and configure a new shell type bash for testing only\n      .",
-        "property_value" : "/bin/bash",
-        "stack_version" : "1.3.0",
-        "property_name" : "bash_shell_command",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/hbase_nice_name",
-      "StackConfigurations" : {
-        "property_description" : "Define and configure a new shell type hbase",
-        "property_value" : "HBase Shell",
-        "stack_version" : "1.3.0",
-        "property_name" : "hbase_nice_name",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/http_port",
-      "StackConfigurations" : {
-        "property_description" : "Webserver listens on this address and port",
-        "property_value" : "8000",
-        "stack_version" : "1.3.0",
-        "property_name" : "http_port",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/smtp_host",
-      "StackConfigurations" : {
-        "property_description" : "The SMTP server information for email notification delivery.",
-        "property_value" : "localhost",
-        "stack_version" : "1.3.0",
-        "property_name" : "smtp_host",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_engine",
-      "StackConfigurations" : {
-        "property_description" : "Configuration options for specifying the Desktop Database.",
-        "property_value" : "mysql",
-        "stack_version" : "1.3.0",
-        "property_name" : "db_engine",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/http_500_debug_mode",
-      "StackConfigurations" : {
-        "property_description" : "Turn off backtrace for server error",
-        "property_value" : "1",
-        "stack_version" : "1.3.0",
-        "property_name" : "http_500_debug_mode",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    }
-  ]
-}

+ 0 - 280
ambari-web/app/assets/data/wizard/stack/hdp/version1.3.0/global.json

@@ -2186,286 +2186,6 @@
         }
       ]
     },
-    {
-      "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE",
-      "StackServices" : {
-        "stack_version" : "1.3.0",
-        "service_name" : "HUE",
-        "stack_name" : "HDP"
-      },
-      "configurations" : [
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/jobtracker_port",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "jobtracker_port",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_user",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "db_user",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/http_host",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "http_host",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_port",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "db_port",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/whitelist",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "whitelist",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/django_debug_mode",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "django_debug_mode",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/smtp_host",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "smtp_host",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/smtp_password",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "smtp_password",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_engine",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "db_engine",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/send_debug_messages",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "send_debug_messages",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/tls",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "tls",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/bash_shell_command",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "bash_shell_command",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/pig_shell_command",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "pig_shell_command",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/http_500_debug_mode",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "http_500_debug_mode",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/hadoop_mapred_home",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "hadoop_mapred_home",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/time_zone",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "time_zone",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_host",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "db_host",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_password",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "db_password",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/database_logging",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "database_logging",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_name",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "db_name",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/hbase_shell_command",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "hbase_shell_command",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/default_from_email",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "default_from_email",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/use_cherrypy_server",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "use_cherrypy_server",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/http_port",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "http_port",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/hbase_nice_name",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "hbase_nice_name",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/backend_auth_policy",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "backend_auth_policy",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/smtp_port",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "smtp_port",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        }
-      ]
-    },
     {
       "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/GANGLIA",
       "StackServices" : {

+ 0 - 353
ambari-web/app/assets/data/wizard/stack/hdp/version131/HUE.json

@@ -1,353 +0,0 @@
-{
-  "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations?fields=*",
-  "items" : [
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/pig_shell_command",
-      "StackConfigurations" : {
-        "property_description" : "Define and configure a new shell type pig.",
-        "property_value" : "/usr/bin/pig -l /dev/null",
-        "stack_version" : "1.3.1",
-        "property_name" : "pig_shell_command",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_name",
-      "StackConfigurations" : {
-        "property_description" : "Configuration options for specifying the Desktop Database.",
-        "property_value" : "sandbox",
-        "stack_version" : "1.3.1",
-        "property_name" : "db_name",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_user",
-      "StackConfigurations" : {
-        "property_description" : "Configuration options for specifying the Desktop Database.",
-        "property_value" : "sandbox",
-        "stack_version" : "1.3.1",
-        "property_name" : "db_user",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_host",
-      "StackConfigurations" : {
-        "property_description" : "Configuration options for specifying the Desktop Database.",
-        "property_value" : "localhost",
-        "stack_version" : "1.3.1",
-        "property_name" : "db_host",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_password",
-      "StackConfigurations" : {
-        "property_description" : "Configuration options for specifying the Desktop Database.",
-        "property_value" : "1111",
-        "stack_version" : "1.3.1",
-        "property_name" : "db_password",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/time_zone",
-      "StackConfigurations" : {
-        "property_description" : "Time zone name",
-        "property_value" : "America/Los_Angeles",
-        "stack_version" : "1.3.1",
-        "property_name" : "time_zone",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/http_host",
-      "StackConfigurations" : {
-        "property_description" : "Webserver listens on this address and port",
-        "property_value" : "0.0.0.0",
-        "stack_version" : "1.3.1",
-        "property_name" : "http_host",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/hue_pid_dir",
-      "StackConfigurations" : {
-        "property_description" : "Hue Pid Dir.",
-        "property_value" : "/var/run/hue",
-        "stack_version" : "1.3.1",
-        "property_name" : "hue_pid_dir",
-        "service_name" : "HUE",
-        "type" : "global.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/tls",
-      "StackConfigurations" : {
-        "property_description" : "Whether to use a TLS (secure) connection when talking to the SMTP server.",
-        "property_value" : "no",
-        "stack_version" : "1.3.1",
-        "property_name" : "tls",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/hadoop_mapred_home",
-      "StackConfigurations" : {
-        "property_description" : "The SMTP server information for email notification delivery.",
-        "property_value" : "/usr/lib/hadoop/lib",
-        "stack_version" : "1.3.1",
-        "property_name" : "hadoop_mapred_home",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/default_from_email",
-      "StackConfigurations" : {
-        "property_description" : "The SMTP server information for email notification delivery.",
-        "property_value" : "sandbox@hortonworks.com",
-        "stack_version" : "1.3.1",
-        "property_name" : "default_from_email",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/backend_auth_policy",
-      "StackConfigurations" : {
-        "property_description" : "Authentication backend.",
-        "property_value" : "desktop.auth.backend.AllowAllBackend",
-        "stack_version" : "1.3.1",
-        "property_name" : "backend_auth_policy",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/hue_log_dir",
-      "StackConfigurations" : {
-        "property_description" : "Hue Log Dir.",
-        "property_value" : "/var/log/hue",
-        "stack_version" : "1.3.1",
-        "property_name" : "hue_log_dir",
-        "service_name" : "HUE",
-        "type" : "global.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/whitelist",
-      "StackConfigurations" : {
-        "property_description" : "proxy settings",
-        "property_value" : "(localhost|127\\.0\\.0\\.1):(50030|50070|50060|50075|50111)",
-        "stack_version" : "1.3.1",
-        "property_name" : "whitelist",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/jobtracker_port",
-      "StackConfigurations" : {
-        "property_description" : "The port where the JobTracker IPC listens on.",
-        "property_value" : "50030",
-        "stack_version" : "1.3.1",
-        "property_name" : "jobtracker_port",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_port",
-      "StackConfigurations" : {
-        "property_description" : "Configuration options for specifying the Desktop Database.",
-        "property_value" : "3306",
-        "stack_version" : "1.3.1",
-        "property_name" : "db_port",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/smtp_port",
-      "StackConfigurations" : {
-        "property_description" : "The SMTP server information for email notification delivery.",
-        "property_value" : "25",
-        "stack_version" : "1.3.1",
-        "property_name" : "smtp_port",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/database_logging",
-      "StackConfigurations" : {
-        "property_description" : "To show database transactions, set database_logging to 1.\n      default, database_logging=0",
-        "property_value" : "0",
-        "stack_version" : "1.3.1",
-        "property_name" : "database_logging",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/send_debug_messages",
-      "StackConfigurations" : {
-        "property_description" : null,
-        "property_value" : "1",
-        "stack_version" : "1.3.1",
-        "property_name" : "send_debug_messages",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/smtp_password",
-      "StackConfigurations" : {
-        "property_description" : "The SMTP server information for email notification delivery.",
-        "property_value" : "25",
-        "stack_version" : "1.3.1",
-        "property_name" : "smtp_password",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/django_debug_mode",
-      "StackConfigurations" : {
-        "property_description" : "Turn off debug",
-        "property_value" : "1",
-        "stack_version" : "1.3.1",
-        "property_name" : "django_debug_mode",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/use_cherrypy_server",
-      "StackConfigurations" : {
-        "property_description" : "Set to true to use CherryPy as the webserver, set to false\n      to use Spawning as the webserver. Defaults to Spawning if\n      key is not specified.",
-        "property_value" : "false",
-        "stack_version" : "1.3.1",
-        "property_name" : "use_cherrypy_server",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/hbase_shell_command",
-      "StackConfigurations" : {
-        "property_description" : "Define and configure a new shell type hbase.",
-        "property_value" : "/usr/bin/hbase shell",
-        "stack_version" : "1.3.1",
-        "property_name" : "hbase_shell_command",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/bash_shell_command",
-      "StackConfigurations" : {
-        "property_description" : "Define and configure a new shell type bash for testing only\n      .",
-        "property_value" : "/bin/bash",
-        "stack_version" : "1.3.1",
-        "property_name" : "bash_shell_command",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/hbase_nice_name",
-      "StackConfigurations" : {
-        "property_description" : "Define and configure a new shell type hbase",
-        "property_value" : "HBase Shell",
-        "stack_version" : "1.3.1",
-        "property_name" : "hbase_nice_name",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/http_port",
-      "StackConfigurations" : {
-        "property_description" : "Webserver listens on this address and port",
-        "property_value" : "8000",
-        "stack_version" : "1.3.1",
-        "property_name" : "http_port",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/smtp_host",
-      "StackConfigurations" : {
-        "property_description" : "The SMTP server information for email notification delivery.",
-        "property_value" : "localhost",
-        "stack_version" : "1.3.1",
-        "property_name" : "smtp_host",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_engine",
-      "StackConfigurations" : {
-        "property_description" : "Configuration options for specifying the Desktop Database.",
-        "property_value" : "mysql",
-        "stack_version" : "1.3.1",
-        "property_name" : "db_engine",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/http_500_debug_mode",
-      "StackConfigurations" : {
-        "property_description" : "Turn off backtrace for server error",
-        "property_value" : "1",
-        "stack_version" : "1.3.1",
-        "property_name" : "http_500_debug_mode",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    }
-  ]
-}

+ 0 - 280
ambari-web/app/assets/data/wizard/stack/hdp/version131/global.json

@@ -2186,286 +2186,6 @@
         }
       ]
     },
-    {
-      "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE",
-      "StackServices" : {
-        "stack_version" : "1.3.1",
-        "service_name" : "HUE",
-        "stack_name" : "HDP"
-      },
-      "configurations" : [
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/jobtracker_port",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.1",
-            "property_name" : "jobtracker_port",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_user",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.1",
-            "property_name" : "db_user",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/http_host",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.1",
-            "property_name" : "http_host",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_port",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.1",
-            "property_name" : "db_port",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/whitelist",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.1",
-            "property_name" : "whitelist",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/django_debug_mode",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.1",
-            "property_name" : "django_debug_mode",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/smtp_host",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.1",
-            "property_name" : "smtp_host",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/smtp_password",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.1",
-            "property_name" : "smtp_password",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_engine",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.1",
-            "property_name" : "db_engine",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/send_debug_messages",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.1",
-            "property_name" : "send_debug_messages",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/tls",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.1",
-            "property_name" : "tls",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/bash_shell_command",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.1",
-            "property_name" : "bash_shell_command",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/pig_shell_command",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.1",
-            "property_name" : "pig_shell_command",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/http_500_debug_mode",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.1",
-            "property_name" : "http_500_debug_mode",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/hadoop_mapred_home",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.1",
-            "property_name" : "hadoop_mapred_home",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/time_zone",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.1",
-            "property_name" : "time_zone",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_host",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.1",
-            "property_name" : "db_host",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_password",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.1",
-            "property_name" : "db_password",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/database_logging",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.1",
-            "property_name" : "database_logging",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_name",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.1",
-            "property_name" : "db_name",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/hbase_shell_command",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.1",
-            "property_name" : "hbase_shell_command",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/default_from_email",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.1",
-            "property_name" : "default_from_email",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/use_cherrypy_server",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.1",
-            "property_name" : "use_cherrypy_server",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/http_port",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.1",
-            "property_name" : "http_port",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/hbase_nice_name",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.1",
-            "property_name" : "hbase_nice_name",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/backend_auth_policy",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.1",
-            "property_name" : "backend_auth_policy",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/smtp_port",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.1",
-            "property_name" : "smtp_port",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        }
-      ]
-    },
     {
       "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/GANGLIA",
       "StackServices" : {

+ 0 - 353
ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/HUE.json

@@ -1,353 +0,0 @@
-{
-  "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations?fields=*",
-  "items" : [
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/pig_shell_command",
-      "StackConfigurations" : {
-        "property_description" : "Define and configure a new shell type pig.",
-        "property_value" : "/usr/bin/pig -l /dev/null",
-        "stack_version" : "1.3.0",
-        "property_name" : "pig_shell_command",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_name",
-      "StackConfigurations" : {
-        "property_description" : "Configuration options for specifying the Desktop Database.",
-        "property_value" : "sandbox",
-        "stack_version" : "1.3.0",
-        "property_name" : "db_name",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_user",
-      "StackConfigurations" : {
-        "property_description" : "Configuration options for specifying the Desktop Database.",
-        "property_value" : "sandbox",
-        "stack_version" : "1.3.0",
-        "property_name" : "db_user",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_host",
-      "StackConfigurations" : {
-        "property_description" : "Configuration options for specifying the Desktop Database.",
-        "property_value" : "localhost",
-        "stack_version" : "1.3.0",
-        "property_name" : "db_host",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_password",
-      "StackConfigurations" : {
-        "property_description" : "Configuration options for specifying the Desktop Database.",
-        "property_value" : "1111",
-        "stack_version" : "1.3.0",
-        "property_name" : "db_password",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/time_zone",
-      "StackConfigurations" : {
-        "property_description" : "Time zone name",
-        "property_value" : "America/Los_Angeles",
-        "stack_version" : "1.3.0",
-        "property_name" : "time_zone",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/http_host",
-      "StackConfigurations" : {
-        "property_description" : "Webserver listens on this address and port",
-        "property_value" : "0.0.0.0",
-        "stack_version" : "1.3.0",
-        "property_name" : "http_host",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/hue_pid_dir",
-      "StackConfigurations" : {
-        "property_description" : "Hue Pid Dir.",
-        "property_value" : "/var/run/hue",
-        "stack_version" : "1.3.0",
-        "property_name" : "hue_pid_dir",
-        "service_name" : "HUE",
-        "type" : "global.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/tls",
-      "StackConfigurations" : {
-        "property_description" : "Whether to use a TLS (secure) connection when talking to the SMTP server.",
-        "property_value" : "no",
-        "stack_version" : "1.3.0",
-        "property_name" : "tls",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/hadoop_mapred_home",
-      "StackConfigurations" : {
-        "property_description" : "The SMTP server information for email notification delivery.",
-        "property_value" : "/usr/lib/hadoop/lib",
-        "stack_version" : "1.3.0",
-        "property_name" : "hadoop_mapred_home",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/default_from_email",
-      "StackConfigurations" : {
-        "property_description" : "The SMTP server information for email notification delivery.",
-        "property_value" : "sandbox@hortonworks.com",
-        "stack_version" : "1.3.0",
-        "property_name" : "default_from_email",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/backend_auth_policy",
-      "StackConfigurations" : {
-        "property_description" : "Authentication backend.",
-        "property_value" : "desktop.auth.backend.AllowAllBackend",
-        "stack_version" : "1.3.0",
-        "property_name" : "backend_auth_policy",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/hue_log_dir",
-      "StackConfigurations" : {
-        "property_description" : "Hue Log Dir.",
-        "property_value" : "/var/log/hue",
-        "stack_version" : "1.3.0",
-        "property_name" : "hue_log_dir",
-        "service_name" : "HUE",
-        "type" : "global.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/whitelist",
-      "StackConfigurations" : {
-        "property_description" : "proxy settings",
-        "property_value" : "(localhost|127\\.0\\.0\\.1):(50030|50070|50060|50075|50111)",
-        "stack_version" : "1.3.0",
-        "property_name" : "whitelist",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/jobtracker_port",
-      "StackConfigurations" : {
-        "property_description" : "The port where the JobTracker IPC listens on.",
-        "property_value" : "50030",
-        "stack_version" : "1.3.0",
-        "property_name" : "jobtracker_port",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_port",
-      "StackConfigurations" : {
-        "property_description" : "Configuration options for specifying the Desktop Database.",
-        "property_value" : "3306",
-        "stack_version" : "1.3.0",
-        "property_name" : "db_port",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/smtp_port",
-      "StackConfigurations" : {
-        "property_description" : "The SMTP server information for email notification delivery.",
-        "property_value" : "25",
-        "stack_version" : "1.3.0",
-        "property_name" : "smtp_port",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/database_logging",
-      "StackConfigurations" : {
-        "property_description" : "To show database transactions, set database_logging to 1.\n      default, database_logging=0",
-        "property_value" : "0",
-        "stack_version" : "1.3.0",
-        "property_name" : "database_logging",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/send_debug_messages",
-      "StackConfigurations" : {
-        "property_description" : null,
-        "property_value" : "1",
-        "stack_version" : "1.3.0",
-        "property_name" : "send_debug_messages",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/smtp_password",
-      "StackConfigurations" : {
-        "property_description" : "The SMTP server information for email notification delivery.",
-        "property_value" : "25",
-        "stack_version" : "1.3.0",
-        "property_name" : "smtp_password",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/django_debug_mode",
-      "StackConfigurations" : {
-        "property_description" : "Turn off debug",
-        "property_value" : "1",
-        "stack_version" : "1.3.0",
-        "property_name" : "django_debug_mode",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/use_cherrypy_server",
-      "StackConfigurations" : {
-        "property_description" : "Set to true to use CherryPy as the webserver, set to false\n      to use Spawning as the webserver. Defaults to Spawning if\n      key is not specified.",
-        "property_value" : "false",
-        "stack_version" : "1.3.0",
-        "property_name" : "use_cherrypy_server",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/hbase_shell_command",
-      "StackConfigurations" : {
-        "property_description" : "Define and configure a new shell type hbase.",
-        "property_value" : "/usr/bin/hbase shell",
-        "stack_version" : "1.3.0",
-        "property_name" : "hbase_shell_command",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/bash_shell_command",
-      "StackConfigurations" : {
-        "property_description" : "Define and configure a new shell type bash for testing only\n      .",
-        "property_value" : "/bin/bash",
-        "stack_version" : "1.3.0",
-        "property_name" : "bash_shell_command",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/hbase_nice_name",
-      "StackConfigurations" : {
-        "property_description" : "Define and configure a new shell type hbase",
-        "property_value" : "HBase Shell",
-        "stack_version" : "1.3.0",
-        "property_name" : "hbase_nice_name",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/http_port",
-      "StackConfigurations" : {
-        "property_description" : "Webserver listens on this address and port",
-        "property_value" : "8000",
-        "stack_version" : "1.3.0",
-        "property_name" : "http_port",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/smtp_host",
-      "StackConfigurations" : {
-        "property_description" : "The SMTP server information for email notification delivery.",
-        "property_value" : "localhost",
-        "stack_version" : "1.3.0",
-        "property_name" : "smtp_host",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_engine",
-      "StackConfigurations" : {
-        "property_description" : "Configuration options for specifying the Desktop Database.",
-        "property_value" : "mysql",
-        "stack_version" : "1.3.0",
-        "property_name" : "db_engine",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    },
-    {
-      "href" : "http://ec2-72-44-40-84.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/http_500_debug_mode",
-      "StackConfigurations" : {
-        "property_description" : "Turn off backtrace for server error",
-        "property_value" : "1",
-        "stack_version" : "1.3.0",
-        "property_name" : "http_500_debug_mode",
-        "service_name" : "HUE",
-        "type" : "hue-site.xml",
-        "stack_name" : "HDP"
-      }
-    }
-  ]
-}

+ 0 - 280
ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/global.json

@@ -2186,286 +2186,6 @@
         }
       ]
     },
-    {
-      "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE",
-      "StackServices" : {
-        "stack_version" : "1.3.0",
-        "service_name" : "HUE",
-        "stack_name" : "HDP"
-      },
-      "configurations" : [
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/jobtracker_port",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "jobtracker_port",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_user",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "db_user",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/http_host",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "http_host",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_port",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "db_port",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/whitelist",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "whitelist",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/django_debug_mode",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "django_debug_mode",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/smtp_host",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "smtp_host",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/smtp_password",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "smtp_password",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_engine",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "db_engine",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/send_debug_messages",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "send_debug_messages",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/tls",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "tls",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/bash_shell_command",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "bash_shell_command",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/pig_shell_command",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "pig_shell_command",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/http_500_debug_mode",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "http_500_debug_mode",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/hadoop_mapred_home",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "hadoop_mapred_home",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/time_zone",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "time_zone",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_host",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "db_host",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_password",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "db_password",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/database_logging",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "database_logging",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/db_name",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "db_name",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/hbase_shell_command",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "hbase_shell_command",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/default_from_email",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "default_from_email",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/use_cherrypy_server",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "use_cherrypy_server",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/http_port",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "http_port",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/hbase_nice_name",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "hbase_nice_name",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/backend_auth_policy",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "backend_auth_policy",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE/configurations/smtp_port",
-          "StackConfigurations" : {
-            "stack_version" : "1.3.0",
-            "property_name" : "smtp_port",
-            "filename" : "hue-site.xml",
-            "service_name" : "HUE",
-            "stack_name" : "HDP"
-          }
-        }
-      ]
-    },
     {
       "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/GANGLIA",
       "StackServices" : {

+ 0 - 22
ambari-web/app/assets/data/wizard/stack/stacks.json

@@ -53,17 +53,6 @@
             "comments" : "This is comment for ZOOKEEPER service"
           }
         },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE",
-          "StackServices" : {
-            "user_name" : "root",
-            "stack_version" : "1.3.0",
-            "service_name" : "HUE",
-            "stack_name" : "HDP",
-            "service_version" : "2.2.0",
-            "comments" : "Hue is a graphical user interface to operate and develop\n      applications for Apache Hadoop."
-          }
-        },
         {
           "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS",
           "StackServices" : {
@@ -588,17 +577,6 @@
             "comments" : "This is comment for ZOOKEEPER service"
           }
         },
-        {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HUE",
-          "StackServices" : {
-            "user_name" : "root",
-            "stack_version" : "1.3.0",
-            "service_name" : "HUE",
-            "stack_name" : "HDP",
-            "service_version" : "2.2.0",
-            "comments" : "Hue is a graphical user interface to operate and develop\n      applications for Apache Hadoop."
-          }
-        },
         {
           "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HDFS",
           "StackServices" : {

+ 0 - 3
ambari-web/app/assets/test/tests.js

@@ -170,7 +170,6 @@ var files = ['test/init_model_test',
   'test/views/main/service/item_test',
   'test/views/main/service/info/config_test',
   'test/views/main/service/info/summary_test',
-  'test/views/main/mirroring/edit_dataset_view_test',
   'test/views/common/configs/services_config_test',
   'test/views/wizard/step3/hostLogPopupBody_view_test',
   'test/views/wizard/step3/hostWarningPopupBody_view_test',
@@ -196,8 +195,6 @@ var files = ['test/init_model_test',
   'test/models/authentication_test',
   'test/models/cluster_states_test',
   'test/models/config_group_test',
-  'test/models/dataset_test',
-  'test/models/dataset_job_test',
   'test/models/form_test',
   'test/models/host_test',
   'test/models/host_component_test',

+ 1 - 31
ambari-web/app/config.js

@@ -50,38 +50,8 @@ App.healthIconClassYellow = 'icon-question-sign'; // bootstrap icon class for he
 App.enableExperimental = false;
 
 App.supports = {
-  addServices: true,
-  hostOverrides: true,
-  hostOverridesInstaller: true,
-  hostOverridesHost: true,
-  mirroring: false,
-  secureCluster: true,
-  secureClusterProceedPopup: false,
-  reassignMaster: true,
   stackUpgrade: false,
-  capacitySchedulerUi: false,
-  startStopAllServices: true,
-  hiveOozieExtraDatabases: true,
-  multipleHBaseMasters: true,
-  addMasters: false,
-  customizeSmokeTestUser: true,
-  hue: false,
-  falcon: true,
-  ldapGroupMapping: false,
-  localRepositories: true,
-  highAvailability: true,
-  resourceManagerHighAvailability: true,
-  deleteHost: true,
-  autoRollbackHA: false,
-  appTimelineServer: true,
-  ubuntu: true,
-  views: true,
-  flume: true,
-  databaseConnection: true,
-  configHistory: true,
-  serverRecommendValidate: true,
-  downloadClientConfigs: true,
-  abortRequests: true
+  autoRollbackHA: false
 };
 
 if (App.enableExperimental) {

+ 0 - 5
ambari-web/app/controllers.js

@@ -114,11 +114,6 @@ require('controllers/main/charts/heatmap_metrics/heatmap_metric_hbase_memstoresi
 require('controllers/main/charts/heatmap');
 require('controllers/main/apps_controller');
 require('controllers/main/apps/item_controller');
-require('controllers/main/mirroring_controller');
-require('controllers/main/mirroring/edit_dataset_controller');
-require('controllers/main/mirroring/datasets_controller');
-require('controllers/main/mirroring/jobs_controller');
-require('controllers/main/mirroring/manage_clusters_controller');
 require('controllers/main/views_controller');
 require('controllers/main/views/details_controller');
 require('controllers/wizard/slave_component_groups_controller');

+ 2 - 6
ambari-web/app/controllers/global/cluster_controller.js

@@ -321,13 +321,9 @@ App.ClusterController = Em.Controller.extend({
 
         updater.updateServiceMetric(function () {
 
-          if (App.supports.hostOverrides) {
-            updater.updateComponentConfig(function () {
-              self.updateLoadStatus('componentConfigs');
-            });
-          } else {
+          updater.updateComponentConfig(function () {
             self.updateLoadStatus('componentConfigs');
-          }
+          });
 
           updater.updateComponentsState(function () {
             self.updateLoadStatus('componentsState');

+ 1 - 3
ambari-web/app/controllers/global/update_controller.js

@@ -127,9 +127,7 @@ App.UpdateController = Em.Controller.extend({
       App.updater.run(this, 'updateServiceMetricConditionally', 'isWorking', App.componentsUpdateInterval);
       App.updater.run(this, 'updateComponentsState', 'isWorking', App.componentsUpdateInterval);
       App.updater.run(this, 'graphsUpdate', 'isWorking');
-      if (App.supports.hostOverrides) {
-        App.updater.run(this, 'updateComponentConfig', 'isWorking');
-      }
+      App.updater.run(this, 'updateComponentConfig', 'isWorking');
     }
   }.observes('isWorking'),
   /**

+ 0 - 1
ambari-web/app/controllers/main/admin/repositories.js

@@ -96,7 +96,6 @@ App.MainAdminRepositoriesController = Em.Controller.extend({
   loadRepositoriesSuccessCallback: function (data) {
     var allRepos = [];
     data.items.forEach(function (os) {
-      if (!App.get('supports.ubuntu') && os.OperatingSystems.os_type == 'ubuntu12') return; // @todo: remove after Ubuntu support confirmation
       os.repositories.forEach(function (repository) {
         var osType = repository.Repositories.os_type;
         var repo = Em.Object.create({

+ 0 - 3
ambari-web/app/controllers/main/host/details.js

@@ -1498,9 +1498,6 @@ App.MainHostDetailsController = Em.Controller.extend({
    * @method validateAndDeleteHost
    */
   validateAndDeleteHost: function () {
-    if (!App.supports.deleteHost) {
-      return false;
-    }
     var container = this.getHostComponentsInfo();
 
     if (container.masterComponents.length > 0) {

+ 0 - 3
ambari-web/app/controllers/main/service.js

@@ -51,9 +51,6 @@ App.MainServiceController = Em.ArrayController.extend({
   isAllServicesInstalled: function () {
     if (!this.get('content.content')) return false;
     var availableServices = App.StackService.find().mapProperty('serviceName');
-    if (!App.get('supports.hue')) {
-      availableServices = availableServices.without('HUE');
-    }
     return this.get('content.content').length == availableServices.length;
   }.property('content.content.@each', 'content.content.length'),
 

+ 65 - 134
ambari-web/app/controllers/main/service/info/configs.js

@@ -81,9 +81,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM
     }
   }.property('App.isHadoop2Stack'),
 
-  showConfigHistoryFeature: function() {
-    return App.get('supports.configHistory');
-  }.property('App.supports.configHistory'),
+  showConfigHistoryFeature: true,
   /**
    * Map, which contains relation between group and site
    * to upload overridden properties
@@ -280,11 +278,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM
     App.config.loadAdvancedConfig(serviceName, function (properties) {
       advancedConfigs.pushObjects(properties);
       self.set('advancedConfigs', advancedConfigs);
-      if (App.get('supports.configHistory')) {
-        self.loadServiceConfigVersions();
-      } else {
-        self.loadServiceTagsAndGroups();
-      }
+      self.loadServiceConfigVersions();
     });
   },
 
@@ -413,20 +407,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM
   },
 
   loadServiceConfigsSuccess: function (data, opt, params) {
-    if (App.get('supports.configHistory')) {
-      this.setConfigGroups(data, opt, params);
-      return;
-    }
-    if (data) {
-      this.setConfigGroups(data, opt, params);
-    } else {
-      App.ajax.send({
-        name: 'config.tags',
-        sender: this,
-        data: App.permit(params, ['clusterName', 'serviceConfigsDef', 'serviceName']),
-        success: 'setConfigGroups'
-      });
-    }
+    this.setConfigGroups(data, opt, params);
   },
 
   setConfigTags: function (data, opt, params) {
@@ -444,51 +425,46 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM
   },
 
   setConfigGroups: function (data, opt, params) {
-    if (!App.get('supports.configHistory')) {
-      this.setConfigTags(data, opt, params);
-    }
     var serviceName = this.get('content.serviceName');
     var displayName = this.get('content.displayName');
     var selectedConfigGroup;
     var defaultHosts = App.get('allHostNames');
 
     //parse loaded config groups
-    if (App.get('supports.hostOverrides')) {
-      var configGroups = [];
-      if (data && data.config_groups && data.config_groups.length) {
-        data.config_groups.forEach(function (item) {
-          item = item.ConfigGroup;
-          if (item.tag === this.get('content.serviceName')) {
-            var groupHosts = item.hosts.mapProperty('host_name');
-            var newConfigGroup = App.ConfigGroup.create({
-              id: item.id,
-              name: item.group_name,
-              description: item.description,
-              isDefault: false,
-              parentConfigGroup: null,
-              service: App.Service.find().findProperty('serviceName', item.tag),
-              hosts: groupHosts,
-              configSiteTags: []
-            });
-            for (var i = 0; i< groupHosts.length ; i++) {
-              defaultHosts = defaultHosts.without(groupHosts[i]);
-            }
-            item.desired_configs.forEach(function (config) {
-              newConfigGroup.configSiteTags.push(App.ConfigSiteTag.create({
-                site: config.type,
-                tag: config.tag
-              }));
-            }, this);
-            // select default selected group for hosts page
-            if (!selectedConfigGroup && this.get('isHostsConfigsPage') && newConfigGroup.get('hosts').contains(this.get('host.hostName')) && this.get('content.serviceName') === item.tag) {
-              selectedConfigGroup = newConfigGroup;
-            }
-            configGroups.push(newConfigGroup);
+    var configGroups = [];
+    if (data && data.config_groups && data.config_groups.length) {
+      data.config_groups.forEach(function (item) {
+        item = item.ConfigGroup;
+        if (item.tag === this.get('content.serviceName')) {
+          var groupHosts = item.hosts.mapProperty('host_name');
+          var newConfigGroup = App.ConfigGroup.create({
+            id: item.id,
+            name: item.group_name,
+            description: item.description,
+            isDefault: false,
+            parentConfigGroup: null,
+            service: App.Service.find().findProperty('serviceName', item.tag),
+            hosts: groupHosts,
+            configSiteTags: []
+          });
+          for (var i = 0; i < groupHosts.length; i++) {
+            defaultHosts = defaultHosts.without(groupHosts[i]);
           }
-        }, this);
-      }
-      this.set('configGroups', configGroups);
+          item.desired_configs.forEach(function (config) {
+            newConfigGroup.configSiteTags.push(App.ConfigSiteTag.create({
+              site: config.type,
+              tag: config.tag
+            }));
+          }, this);
+          // select default selected group for hosts page
+          if (!selectedConfigGroup && this.get('isHostsConfigsPage') && newConfigGroup.get('hosts').contains(this.get('host.hostName')) && this.get('content.serviceName') === item.tag) {
+            selectedConfigGroup = newConfigGroup;
+          }
+          configGroups.push(newConfigGroup);
+        }
+      }, this);
     }
+    this.set('configGroups', configGroups);
     var defaultConfigGroup = App.ConfigGroup.create({
       name: displayName + " Default",
       description: "Default cluster level " + serviceName + " configuration",
@@ -517,10 +493,6 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM
     var selectedConfigGroup = this.get('selectedConfigGroup');
     var serviceName = this.get('content.serviceName');
     //STEP 1: handle tags from JSON data for host overrides
-    if (!App.get('supports.configHistory')) {
-      //if config history enabled then loadedGroupToOverrideSiteToTagMap already has content set in loadSelectedVersionSuccess()
-      this.loadedGroupToOverrideSiteToTagMap = {};
-    }
     var configGroupsWithOverrides = selectedConfigGroup.get('isDefault') && !this.get('isHostsConfigsPage') ? this.get('configGroups') : [selectedConfigGroup];
     configGroupsWithOverrides.forEach(function (item) {
       var groupName = item.get('name');
@@ -546,7 +518,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM
       //add custom configs
       App.config.addCustomConfigs(configs);
       //put properties from capacity-scheduler.xml into one config with textarea view
-      if (self.get('content.serviceName') === 'YARN' && !App.get('supports.capacitySchedulerUi')) {
+      if (self.get('content.serviceName') === 'YARN') {
         configs = App.config.fileConfigsIntoTextarea(configs, 'capacity-scheduler.xml');
       }
       self.set('allConfigs', configs);
@@ -846,30 +818,17 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM
       App.config.OnNnHAHideSnn(serviceConfig);
     }
 
-    if (serviceName && !App.get('supports.serverRecommendValidate')) {
-      // set recommended Defaults first then load the configs (including set validator)
-      var s = App.StackService.find().findProperty('serviceName', this.get('content.serviceName'));
-      var defaultsProvider = s.get('defaultsProviders');
-      if (defaultsProvider) {
-        this.getInfoForDefaults(defaultsProvider);
-      } else {
-        Em.run(this, 'setDefaults');
-      }
-    } else {
-      if (App.get('supports.serverRecommendValidate')) {
-        serviceConfig = App.config.createServiceConfig(this.get('content.serviceName'));
-        this.loadConfigs(this.get('allConfigs'), serviceConfig);
-        this.checkOverrideProperty(serviceConfig);
-        this.checkDatabaseProperties(serviceConfig);
-        this.get('stepConfigs').pushObject(serviceConfig);
-      }
-      this.set('selectedService', this.get('stepConfigs').objectAt(0));
-      this.checkForSecureConfig(this.get('selectedService'));
-      this.set('dataIsLoaded', true);
-      this.set('versionLoaded', true);
-      this.set('hash', this.getHash());
-      this.set('isInit', false);
-    }
+    serviceConfig = App.config.createServiceConfig(this.get('content.serviceName'));
+    this.loadConfigs(this.get('allConfigs'), serviceConfig);
+    this.checkOverrideProperty(serviceConfig);
+    this.checkDatabaseProperties(serviceConfig);
+    this.get('stepConfigs').pushObject(serviceConfig);
+    this.set('selectedService', this.get('stepConfigs').objectAt(0));
+    this.checkForSecureConfig(this.get('selectedService'));
+    this.set('dataIsLoaded', true);
+    this.set('versionLoaded', true);
+    this.set('hash', this.getHash());
+    this.set('isInit', false);
   },
 
   //TODO after moving validation/recommendation to BE getInfoForDefaults must be deleted
@@ -1229,7 +1188,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM
     newSCP.set('supportsFinal', serviceConfigProperty.get('supportsFinal'));
     newSCP.set('isOriginalSCP', false); // indicated this is overridden value,
     newSCP.set('parentSCP', serviceConfigProperty);
-    if (App.get('supports.hostOverrides') && defaultGroupSelected) {
+    if (defaultGroupSelected) {
       newSCP.set('group', override.group);
       newSCP.set('isEditable', false);
     }
@@ -1268,37 +1227,19 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM
     var serviceName = this.get('content.serviceName'),
       displayName = this.get('content.displayName'),
       urlParams = '';
-
-    if (App.get('supports.hostOverrides') ||
-      (serviceName !== 'HDFS' && this.get('content.isStopped') === true) ||
-      ((serviceName === 'HDFS') && this.get('content.isStopped') === true && (!App.Service.find().someProperty('id', 'MAPREDUCE') || App.Service.find('MAPREDUCE').get('isStopped')))) {
-
-      this.serverSideValidation().done(function() {
-        if (self.isDirChanged()) {
-          App.showConfirmationPopup(function () {
-            self.saveConfigs();
-          }, Em.I18n.t('services.service.config.confirmDirectoryChange').format(displayName), function () {
-            self.set('isApplyingChanges', false);
-          });
-        } else {
+    this.serverSideValidation().done(function () {
+      if (self.isDirChanged()) {
+        App.showConfirmationPopup(function () {
           self.saveConfigs();
-        }
-      }).fail(function() {
-        self.set('isApplyingChanges', false);
-      });
-    } else {
-      status = 'started';
-      if (this.get('content.serviceName') !== 'HDFS' || (this.get('content.serviceName') === 'HDFS' && !App.Service.find().someProperty('id', 'MAPREDUCE'))) {
-        header = Em.I18n.t('services.service.config.notSaved');
-        message = Em.I18n.t('services.service.config.msgServiceStop');
+        }, Em.I18n.t('services.service.config.confirmDirectoryChange').format(displayName), function () {
+          self.set('isApplyingChanges', false);
+        });
       } else {
-        header = Em.I18n.t('services.service.config.notSaved');
-        message = Em.I18n.t('services.service.config.msgHDFSMapRServiceStop');
-        urlParams += '&ServiceComponentInfo/service_name.in(HDFS,MAPREDUCE)';
+        self.saveConfigs();
       }
-      messageClass = 'alert alert-error';
-      this.showSaveConfigsPopup(header, false, message, messageClass, null, status, urlParams);
-    }
+    }).fail(function () {
+      self.set('isApplyingChanges', false);
+    });
   },
 
   /**
@@ -1343,7 +1284,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM
     var self = this;
 
     if (selectedConfigGroup.get('isDefault')) {
-      if (this.get('content.serviceName') === 'YARN' && !App.get('supports.capacitySchedulerUi')) {
+      if (this.get('content.serviceName') === 'YARN') {
         configs = App.config.textareaIntoFileConfigs(configs, 'capacity-scheduler.xml');
       }
       var modifiedConfigs = configs
@@ -1957,7 +1898,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM
         break;
       default:
         var filename = (App.config.get('filenameExceptions').contains(siteName)) ? siteName : siteName + '.xml';
-        if (filename === 'mapred-queue-acls.xml' && !App.get('supports.capacitySchedulerUi')) {
+        if (filename === 'mapred-queue-acls.xml') {
           return null;
         }
         configObject = this.createSiteObj(siteName, tagName, this.get('uiConfigs').filterProperty('filename', filename));
@@ -2285,12 +2226,6 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM
       serviceUseThis: [],
       m: true
     },
-    {
-      hostProperty: 'hueserver_host',
-      componentName: 'HUE_SERVER',
-      serviceName: 'HUE',
-      serviceUseThis: []
-    },
     {
       hostProperty: 'webhcatserver_host',
       componentName: 'WEBHCAT_SERVER',
@@ -2699,16 +2634,12 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM
     }
     //clean when switch config group
     this.loadedGroupToOverrideSiteToTagMap = {};
-    if (App.get('supports.configHistory')) {
-      var configGroupVersions = App.ServiceConfigVersion.find().filterProperty('groupId', event.context.get('id'));
-      //check whether config group has config versions
-      if (configGroupVersions.length > 0) {
-        this.loadSelectedVersion(configGroupVersions.findProperty('isCurrent').get('version'), event.context);
-      } else {
-        this.loadSelectedVersion(null, event.context);
-      }
+    var configGroupVersions = App.ServiceConfigVersion.find().filterProperty('groupId', event.context.get('id'));
+    //check whether config group has config versions
+    if (configGroupVersions.length > 0) {
+      this.loadSelectedVersion(configGroupVersions.findProperty('isCurrent').get('version'), event.context);
     } else {
-      this.set('selectedConfigGroup', event.context);
+      this.loadSelectedVersion(null, event.context);
     }
   },
 

+ 1 - 1
ambari-web/app/controllers/wizard.js

@@ -829,7 +829,7 @@ App.WizardController = Em.Controller.extend(App.LocalStorage, {
     var fileNamesToUpdate = [];
     stepController.get('stepConfigs').forEach(function (_content) {
 
-      if (_content.serviceName === 'YARN' && !App.supports.capacitySchedulerUi) {
+      if (_content.serviceName === 'YARN') {
         _content.set('configs', App.config.textareaIntoFileConfigs(_content.get('configs'), 'capacity-scheduler.xml'));
       }
 

+ 3 - 161
ambari-web/app/controllers/wizard/step5_controller.js

@@ -249,7 +249,7 @@ App.WizardStep5Controller = Em.Controller.extend(App.BlueprintMixin, {
       return false;
     }
 
-    if (App.get('supports.serverRecommendValidate') && this.get('useServerValidation')) {
+    if (this.get('useServerValidation')) {
       self.set('submitDisabled', true);
 
       // reset previous recommendations
@@ -419,11 +419,7 @@ App.WizardStep5Controller = Em.Controller.extend(App.BlueprintMixin, {
     console.log("WizardStep5Controller: Loading step5: Assign Masters");
     this.clearStep();
     this.renderHostInfo();
-    if (App.get('supports.serverRecommendValidate')) {
-      this.loadComponentsRecommendationsFromServer(this.loadStepCallback);
-    } else {
-      this.loadComponentsRecommendationsLocally(this.loadStepCallback);
-    }
+    this.loadComponentsRecommendationsFromServer(this.loadStepCallback);
   },
 
   /**
@@ -671,84 +667,6 @@ App.WizardStep5Controller = Em.Controller.extend(App.BlueprintMixin, {
     console.log('Load recommendations failed');
   },
 
-  /**
-   * Load services info to appropriate variable and return masterComponentHosts
-   * @return {Object[]}
-   */
-  loadComponentsRecommendationsLocally: function (callback) {
-    var selectedServices = App.StackService.find().filterProperty('isSelected').mapProperty('serviceName');
-    var installedServices = App.StackService.find().filterProperty('isInstalled').mapProperty('serviceName');
-    var services = installedServices.concat(selectedServices).uniq();
-    var selectedNotInstalledServices = this.get('content.services').filterProperty('isSelected').filterProperty('isInstalled', false).mapProperty('serviceName');
-
-    var masterComponents = [];
-    //get full list from mock data
-    if (this.get('isAddServiceWizard')) {
-      masterComponents = App.StackServiceComponent.find().filterProperty('isShownOnAddServiceAssignMasterPage');
-    } else {
-      masterComponents = App.StackServiceComponent.find().filterProperty('isShownOnInstallerAssignMasterPage');
-    }
-    var masterHosts = this.get('content.masterComponentHosts'); //saved to local storage info
-
-    var resultComponents = [];
-
-    for (var index = 0; index < services.length; index++) {
-      var componentInfo = masterComponents.filterProperty('serviceName', services[index]);
-      // If service is already installed and not being added as a new service then render on UI only those master components
-      // that have already installed hostComponents.
-      // NOTE: On upgrade there might be a prior installed service with non-installed newly introduced serviceComponent
-      var isNotSelectedService = !selectedNotInstalledServices.contains(services[index]);
-      if (isNotSelectedService) {
-        componentInfo = componentInfo.filter(function (_component) {
-          return App.HostComponent.find().someProperty('componentName',_component.get('componentName'));
-        });
-      }
-
-      componentInfo.forEach(function (_componentInfo) {
-        if (this.get('multipleComponents').contains(_componentInfo.get('componentName'))) {
-          var savedComponents = masterHosts.filterProperty('component', _componentInfo.get('componentName'));
-          if (savedComponents.length) {
-            savedComponents.forEach(function (item) {
-              var multipleMasterHost = {};
-              multipleMasterHost.component_name = _componentInfo.get('componentName');
-              multipleMasterHost.display_name = _componentInfo.get('displayName');
-              multipleMasterHost.selectedHost = item.hostName;
-              multipleMasterHost.serviceId = services[index];
-              multipleMasterHost.isInstalled = item.isInstalled;
-              multipleMasterHost.isServiceCoHost = false;
-              resultComponents.push(multipleMasterHost);
-            })
-          } else {
-            var multipleMasterHosts = this.selectHostLocally(_componentInfo.get('componentName'));
-            multipleMasterHosts.forEach(function (_host) {
-              var multipleMasterHost = {};
-              multipleMasterHost.component_name = _componentInfo.get('componentName');
-              multipleMasterHost.display_name = _componentInfo.get('displayName');
-              multipleMasterHost.selectedHost = _host;
-              multipleMasterHost.serviceId = services[index];
-              multipleMasterHost.isInstalled = false;
-              multipleMasterHost.isServiceCoHost = false;
-              resultComponents.push(multipleMasterHost);
-            });
-
-          }
-        } else {
-          var savedComponent = masterHosts.findProperty('component', _componentInfo.get('componentName'));
-          var componentObj = {};
-          componentObj.component_name = _componentInfo.get('componentName');
-          componentObj.display_name = _componentInfo.get('displayName');
-          componentObj.selectedHost = savedComponent ? savedComponent.hostName : this.selectHostLocally(_componentInfo.get('componentName'));   // call the method that plays selectNode algorithm or fetches from server
-          componentObj.isInstalled = savedComponent ? savedComponent.isInstalled : false;
-          componentObj.serviceId = services[index];
-          componentObj.isServiceCoHost = App.StackServiceComponent.find().findProperty('componentName', _componentInfo.get('componentName')).get('isCoHostedComponent') && !this.get('isReassignWizard');
-          resultComponents.push(componentObj);
-        }
-      }, this);
-    }
-
-    callback(resultComponents, this);
-  },
-
   /**
    * @param {string} componentName
    * @returns {bool}
@@ -822,82 +740,6 @@ App.WizardStep5Controller = Em.Controller.extend(App.BlueprintMixin, {
     }, this);
   }.observes('selectedServicesMasters.@each.selectedHost'),
 
-  /**
-   * select and return host for component by scheme
-   * Scheme is an object that has keys which compared to number of hosts,
-   * if key more that number of hosts, then return value of that key.
-   * Value is index of host in hosts array.
-   *
-   * @param {object} componentName
-   * @param {object} hosts
-   * @return {string}
-   * @method getHostForComponent
-   */
-  getHostForComponent: function (componentName, hosts) {
-    var component = App.StackServiceComponent.find().findProperty('componentName', componentName);
-    if (component) {
-      var selectionScheme = App.StackServiceComponent.find().findProperty('componentName', componentName).get('selectionSchemeForMasterComponent');
-    } else {
-      return hosts[0];
-    }
-
-    if (hosts.length === 1 || $.isEmptyObject(selectionScheme)) {
-      return hosts[0];
-    } else {
-      for (var i in selectionScheme) {
-        if (window.isFinite(i)) {
-          if (hosts.length < window.parseInt(i)) {
-            return hosts[selectionScheme[i]];
-          }
-        }
-      }
-      return hosts[selectionScheme['else']]
-    }
-  },
-
-  /**
-   * Get list of host names for master component with multiple instances
-   * @param {Object} component
-   * @param {Object} hosts
-   * @returns {string[]}
-   * @method getHostsForComponent
-   */
-  getHostsForComponent: function (component, hosts) {
-    var defaultNoOfMasterHosts = component.get('defaultNoOfMasterHosts');
-    var masterHosts = [];
-    if (hosts.length < defaultNoOfMasterHosts) {
-      defaultNoOfMasterHosts = hosts.length;
-    }
-    for (var index = 0; index < defaultNoOfMasterHosts; index++) {
-      masterHosts.push(hosts[index]);
-    }
-    return masterHosts;
-  },
-
-  /**
-   * Return hostName of masterNode for specified service
-   * @param componentName
-   * @return {string|string[]}
-   * @method selectHostLocally
-   */
-  selectHostLocally: function (componentName) {
-    var component = App.StackServiceComponent.find().findProperty('componentName', componentName);
-    var hostNames = this.get('hosts').mapProperty('host_name');
-    if (hostNames.length > 1 && App.StackServiceComponent.find().filterProperty('isNotPreferableOnAmbariServerHost').mapProperty('componentName').contains(componentName)) {
-      hostNames = this.get('hosts').mapProperty('host_name').filter(function (item) {
-        return item !== location.hostname;
-      }, this);
-    }
-    if (this.get('multipleComponents').contains(componentName)) {
-      if (component.get('defaultNoOfMasterHosts') > 1) {
-        return this.getHostsForComponent(component, hostNames);
-      } else {
-        return [this.getHostForComponent(componentName, hostNames)];
-      }
-    } else {
-      return this.getHostForComponent(componentName, hostNames);
-    }
-  },
 
   /**
    * On change callback for inputs
@@ -1101,7 +943,7 @@ App.WizardStep5Controller = Em.Controller.extend(App.BlueprintMixin, {
         self.set('submitButtonClicked', false);
       };
 
-      if (App.get('supports.serverRecommendValidate')  && this.get('useServerValidation')) {
+      if (this.get('useServerValidation')) {
         self.recommendAndValidate(function () {
           self.showValidationIssuesAcceptBox(goNextStepIfValid);
         });

+ 26 - 149
ambari-web/app/controllers/wizard/step6_controller.js

@@ -409,52 +409,35 @@ App.WizardStep6Controller = Em.Controller.extend(App.BlueprintMixin, {
     var clientHeaders = headers.findProperty('name', 'CLIENT');
     var slaveComponents = this.get('content.slaveComponentHosts');
     if (!slaveComponents) { // we are at this page for the first time
-      if (!App.get('supports.serverRecommendValidate')) {
-        hostsObj.forEach(function (host) {
-          var checkboxes = host.get('checkboxes');
-          checkboxes.setEach('checked', !host.hasMaster);
-          checkboxes.setEach('isInstalled', false);
-          if (clientHeaders) {
-            checkboxes.findProperty('title', clientHeaders.get('label')).set('checked', false);
-          }
-        });
-        this.selectClientHost(hostsObj);
-
-        if (this.get('isInstallerWizard') && hostsObj.everyProperty('hasMaster', true)) {
-          var lastHost = hostsObj[hostsObj.length - 1];
-          lastHost.get('checkboxes').setEach('checked', true);
-        }
-      } else {
-        var recommendations = this.get('content.recommendations');
-        // Get all host-component pairs from recommendations
-        var componentHostPairs = recommendations.blueprint.host_groups.map(function (group) {
-          return group.components.map(function (component) {
-            return recommendations.blueprint_cluster_binding.host_groups.findProperty('name', group.name).hosts.map(function (host) {
-              return { component: component.name, host: host.fqdn};
-            });
+      var recommendations = this.get('content.recommendations');
+      // Get all host-component pairs from recommendations
+      var componentHostPairs = recommendations.blueprint.host_groups.map(function (group) {
+        return group.components.map(function (component) {
+          return recommendations.blueprint_cluster_binding.host_groups.findProperty('name', group.name).hosts.map(function (host) {
+            return { component: component.name, host: host.fqdn};
           });
         });
+      });
 
-        // Flatten results twice because of two map() call before
-        componentHostPairs = [].concat.apply([], componentHostPairs);
-        componentHostPairs = [].concat.apply([], componentHostPairs);
-
-        var clientComponents = App.get('components.clients');
-
-        hostsObj.forEach(function (host) {
-          var checkboxes = host.get('checkboxes');
-          checkboxes.forEach(function (checkbox) {
-            var recommended = componentHostPairs.some(function (pair) {
-              var componentMatch = pair.component === checkbox.component;
-              if (checkbox.component === 'CLIENT' && !componentMatch) {
-                componentMatch = clientComponents.contains(pair.component);
-              }
-              return pair.host === host.hostName && componentMatch;
-            });
-            checkbox.checked = recommended;
+      // Flatten results twice because of two map() call before
+      componentHostPairs = [].concat.apply([], componentHostPairs);
+      componentHostPairs = [].concat.apply([], componentHostPairs);
+
+      var clientComponents = App.get('components.clients');
+
+      hostsObj.forEach(function (host) {
+        var checkboxes = host.get('checkboxes');
+        checkboxes.forEach(function (checkbox) {
+          var recommended = componentHostPairs.some(function (pair) {
+            var componentMatch = pair.component === checkbox.component;
+            if (checkbox.component === 'CLIENT' && !componentMatch) {
+              componentMatch = clientComponents.contains(pair.component);
+            }
+            return pair.host === host.hostName && componentMatch;
           });
+          checkbox.checked = recommended;
         });
-      }
+      });
     } else {
       this.get('headers').forEach(function (header) {
         var nodes = slaveComponents.findProperty('componentName', header.get('name'));
@@ -526,16 +509,7 @@ App.WizardStep6Controller = Em.Controller.extend(App.BlueprintMixin, {
   },
 
   callValidation: function (successCallback) {
-    var self = this;
-    if (App.get('supports.serverRecommendValidate')) {
-      self.callServerSideValidation(successCallback);
-    } else {
-      var res = self.callClientSideValidation();
-      self.set('submitDisabled', !res);
-      if (res && successCallback) {
-        successCallback();
-      }
-    }
+    this.callServerSideValidation(successCallback);
   },
 
   /**
@@ -788,103 +762,6 @@ App.WizardStep6Controller = Em.Controller.extend(App.BlueprintMixin, {
     return blueprintUtils.mergeBlueprints(res, this.getCurrentSlaveBlueprint());
   },
 
-  /**
-   * callClientSideValidation form. Return do we have errors or not
-   * @return {bool}
-   * @method callClientSideValidation
-   */
-  callClientSideValidation: function () {
-    if (this.get('isAddHostWizard')) {
-      return this.validateEachHost(Em.I18n.t('installer.step6.error.mustSelectOneForHost'));
-    }
-    else {
-      if (this.get('isInstallerWizard')) {
-        return this.validateEachComponent() && this.validateEachHost(Em.I18n.t('installer.step6.error.mustSelectOneForSlaveHost'));
-      }
-      else {
-        if (this.get('isAddServiceWizard')) {
-          return this.validateEachComponent();
-        }
-        return true;
-      }
-    }
-  },
-
-  /**
-   * Validate all components for each host. Return do we have errors or not
-   * @return {bool}
-   * @method validateEachHost
-   */
-  validateEachHost: function (errorMsg) {
-
-    var isError = false;
-    var hosts = this.get('hosts');
-    var headers = this.get('headers');
-    for (var i = 0; i < hosts.length; i++) {
-      if (this.get('isInstallerWizard') && this.get('content.masterComponentHosts').someProperty('hostName', hosts[i].hostName)) {
-        continue;
-      }
-      var checkboxes = hosts[i].get('checkboxes');
-      isError = false;
-      headers.forEach(function (header) {
-        isError = isError || checkboxes.findProperty('title', header.get('label')).checked;
-      });
-      isError = !isError;
-      if (isError) {
-        this.set('errorMessage', errorMsg);
-        break;
-      }
-    }
-    return !isError;
-  },
-
-  /**
-   * Check for minimum required count of components to install.
-   *
-   * @return {bool}
-   * @method validateEachComponent
-   */
-  validateEachComponent: function () {
-    var isError = false;
-    var hosts = this.get('hosts');
-    var headers = this.get('headers');
-    var componentsToInstall = [];
-    headers.forEach(function (header) {
-      var checkboxes = hosts.mapProperty('checkboxes').reduce(function (cItem, pItem) {
-        return cItem.concat(pItem);
-      });
-      var selectedCount = checkboxes.filterProperty('component', header.get('name')).filterProperty('checked').length;
-      if (header.get('name') == 'CLIENT') {
-        var clientsMinCount = 0;
-        var serviceNames = this.get('installedServiceNames').concat(this.get('content.selectedServiceNames'));
-        // find max value for `minToInstall` property
-        serviceNames.forEach(function (serviceName) {
-          App.StackServiceComponent.find().filterProperty('stackService.serviceName', serviceName).filterProperty('isClient')
-            .mapProperty('minToInstall').forEach(function (ctMinCount) {
-              clientsMinCount = ctMinCount > clientsMinCount ? ctMinCount : clientsMinCount;
-            });
-        });
-        if (selectedCount < clientsMinCount) {
-          isError = true;
-          var requiredQuantity = (clientsMinCount > hosts.length ? hosts.length : clientsMinCount) - selectedCount;
-          componentsToInstall.push(requiredQuantity + ' ' + stringUtils.pluralize(requiredQuantity, Em.I18n.t('common.client')));
-        }
-      } else {
-        var stackComponent = App.StackServiceComponent.find().findProperty('componentName', header.get('name'));
-        if (selectedCount < stackComponent.get('minToInstall')) {
-          isError = true;
-          var requiredQuantity = (stackComponent.get('minToInstall') > hosts.length ? hosts.length : stackComponent.get('minToInstall')) - selectedCount;
-          componentsToInstall.push(requiredQuantity + ' ' + stringUtils.pluralize(requiredQuantity, stackComponent.get('displayName')));
-        }
-      }
-    }, this);
-    if (componentsToInstall.length) {
-      this.set('errorMessage', Em.I18n.t('installer.step6.error.mustSelectComponents').format(componentsToInstall.join(', ')));
-    }
-
-    return !isError;
-  },
-
   /**
    * In case of any validation issues shows accept dialog box for user which allow cancel and fix issues or continue anyway
    * @metohd submit
@@ -892,7 +769,7 @@ App.WizardStep6Controller = Em.Controller.extend(App.BlueprintMixin, {
   showValidationIssuesAcceptBox: function(callback) {
     var self = this;
 
-    if (App.get('supports.serverRecommendValidate') && (self.get('anyWarnings') || self.get('anyErrors'))) {
+    if (self.get('anyWarnings') || self.get('anyErrors')) {
       App.ModalPopup.show({
         primary: Em.I18n.t('common.continueAnyway'),
         header: Em.I18n.t('installer.step6.validationIssuesAttention.header'),

+ 34 - 49
ambari-web/app/controllers/wizard/step7_controller.js

@@ -323,37 +323,35 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, {
     this.set('loadedClusterSiteToTagMap', siteToTagMap);
 
     //parse loaded config groups
-    if (App.get('supports.hostOverrides')) {
-      var configGroups = [];
-      if (data.config_groups.length) {
-        data.config_groups.forEach(function (item) {
-          item = item.ConfigGroup;
-          if (item.tag === serviceName) {
-            var groupHosts = item.hosts.mapProperty('host_name');
-            var newConfigGroup = App.ConfigGroup.create({
-              id: item.id,
-              name: item.group_name,
-              description: item.description,
-              isDefault: false,
-              parentConfigGroup: null,
-              service: App.Service.find().findProperty('serviceName', item.tag),
-              hosts: groupHosts,
-              publicHosts: manageCGController.hostsToPublic(groupHosts),
-              configSiteTags: []
-            });
-            groupHosts.forEach(function (host) {
-              defaultConfigGroupHosts = defaultConfigGroupHosts.without(host);
-            }, this);
-            item.desired_configs.forEach(function (config) {
-              newConfigGroup.configSiteTags.push(App.ConfigSiteTag.create({
-                site: config.type,
-                tag: config.tag
-              }));
-            }, this);
-            configGroups.push(newConfigGroup);
-          }
-        }, this);
-      }
+    var configGroups = [];
+    if (data.config_groups.length) {
+      data.config_groups.forEach(function (item) {
+        item = item.ConfigGroup;
+        if (item.tag === serviceName) {
+          var groupHosts = item.hosts.mapProperty('host_name');
+          var newConfigGroup = App.ConfigGroup.create({
+            id: item.id,
+            name: item.group_name,
+            description: item.description,
+            isDefault: false,
+            parentConfigGroup: null,
+            service: App.Service.find().findProperty('serviceName', item.tag),
+            hosts: groupHosts,
+            publicHosts: manageCGController.hostsToPublic(groupHosts),
+            configSiteTags: []
+          });
+          groupHosts.forEach(function (host) {
+            defaultConfigGroupHosts = defaultConfigGroupHosts.without(host);
+          }, this);
+          item.desired_configs.forEach(function (config) {
+            newConfigGroup.configSiteTags.push(App.ConfigSiteTag.create({
+              site: config.type,
+              tag: config.tag
+            }));
+          }, this);
+          configGroups.push(newConfigGroup);
+        }
+      }, this);
     }
     var defaultConfigGroup = App.ConfigGroup.create({
       name: App.format.role(serviceName) + " Default",
@@ -621,13 +619,6 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, {
     var s = App.StackService.find(component.get('serviceName')),
       defaultGroupSelected = component.get('selectedConfigGroup.isDefault');
 
-    if(!App.get('supports.serverRecommendValidate')) {
-      if (s && s.get('configsValidator')) {
-        var recommendedDefaults = this._getRecommendedDefaultsForComponent(component.get('serviceName'));
-        s.get('configsValidator').set('recommendedDefaults', recommendedDefaults);
-      }
-    }
-
     configs.forEach(function (serviceConfigProperty) {
       if (!serviceConfigProperty) return;
 
@@ -767,7 +758,7 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, {
   },
 
   applyServicesConfigs: function (configs, storedConfigs) {
-    if (this.get('allSelectedServiceNames').contains('YARN') && !App.get('supports.capacitySchedulerUi')) {
+    if (this.get('allSelectedServiceNames').contains('YARN')) {
       configs = App.config.fileConfigsIntoTextarea(configs, 'capacity-scheduler.xml');
     }
     var dependendServices = ["STORM", "YARN"];
@@ -795,11 +786,9 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, {
    * @method checkHostOverrideInstaller
    */
   checkHostOverrideInstaller: function () {
-    if (App.get('supports.hostOverridesInstaller')) {
-      this.loadConfigGroups(this.get('content.configGroups'));
-      if (this.get('installedServiceNames').length > 0) {
-        this.loadInstalledServicesConfigGroups(this.get('installedServiceNames'));
-      }
+    this.loadConfigGroups(this.get('content.configGroups'));
+    if (this.get('installedServiceNames').length > 0) {
+      this.loadInstalledServicesConfigGroups(this.get('installedServiceNames'));
     }
   },
 
@@ -1020,7 +1009,7 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, {
    * @method selectedServiceObserver
    */
   selectedServiceObserver: function () {
-    if (App.supports.hostOverridesInstaller && this.get('selectedService') && (this.get('selectedService.serviceName') !== 'MISC')) {
+    if (this.get('selectedService') && (this.get('selectedService.serviceName') !== 'MISC')) {
       var serviceGroups = this.get('selectedService.configGroups');
       serviceGroups.forEach(function (item, index, array) {
         if (item.isDefault) {
@@ -1304,10 +1293,6 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, {
 
   checkDatabaseConnectionTest: function () {
     var deferred = $.Deferred();
-    if (!App.supports.databaseConnection) {
-      deferred.resolve();
-      return deferred;
-    }
     var configMap = [
       {
         serviceName: 'OOZIE',

+ 2 - 5
ambari-web/app/controllers/wizard/step8_controller.js

@@ -616,7 +616,6 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs, {
   loadRepoInfoSuccessCallback: function (data) {
     var allRepos = [];
     data.items.forEach(function (os) {
-      if (!App.get('supports.ubuntu') && os.OperatingSystems.os_type == 'ubuntu12') return; // @todo: remove after Ubuntu support confirmation
       os.repositories.forEach(function (repository) {
         allRepos.push(Em.Object.create({
           base_url: repository.Repositories.base_url,
@@ -989,9 +988,7 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs, {
       }
       this.createComponents();
       this.registerHostsToCluster();
-      if (App.get('supports.hostOverridesInstaller')) {
-        this.createConfigurationGroups();
-      }
+      this.createConfigurationGroups();
       this.createMasterHostComponents();
       this.createSlaveAndClientsHostComponents();
       if (this.get('content.controllerName') === 'addServiceController') {
@@ -1405,7 +1402,7 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs, {
       Object.keys(service.get('configTypes')).forEach(function (type) {
         if (!this.get('serviceConfigTags').someProperty('type', type)) {
           var serviceVersionNotes = Em.I18n.t('dashboard.configHistory.table.notes.default').format(service.get('displayName'));
-          if (!App.supports.capacitySchedulerUi && service.get('serviceName') === 'MAPREDUCE' && (type === 'capacity-scheduler' || type === 'mapred-queue-acls')) {
+          if (service.get('serviceName') === 'MAPREDUCE' && (type === 'capacity-scheduler' || type === 'mapred-queue-acls')) {
             return;
           } else if (type === 'core-site') {
             coreSiteObject.service_config_version_note = serviceVersionNotes

+ 4 - 14
ambari-web/app/data/BIGTOP/site_properties.js

@@ -2532,8 +2532,7 @@ module.exports =
         },
         {
           displayName: 'Existing Oracle Database',
-          foreignKeys: ['hive_existing_oracle_database', 'hive_existing_oracle_host'],
-          hidden: !App.supports.hiveOozieExtraDatabases
+          foreignKeys: ['hive_existing_oracle_database', 'hive_existing_oracle_host']
         }
       ],
       "description": "PostgreSQL will be installed by Ambari",
@@ -2857,25 +2856,17 @@ module.exports =
           displayName: 'New Derby Database',
           foreignKeys: ['oozie_derby_database']
         },
-        /*{
-         displayName: 'New MySQL Database',
-         foreignKeys: ['oozie_ambari_database', 'oozie_ambari_host'],
-         hidden: !App.supports.hiveOozieExtraDatabases
-         },*/
         {
           displayName: 'Existing MySQL Database',
-          foreignKeys: ['oozie_existing_mysql_database', 'oozie_existing_mysql_host'],
-          hidden: !App.supports.hiveOozieExtraDatabases
+          foreignKeys: ['oozie_existing_mysql_database', 'oozie_existing_mysql_host']
         },
         {
           displayName: 'Existing PostgreSQL Database',
-          foreignKeys: ['oozie_existing_postgresql_database', 'oozie_existing_postgresql_host'],
-          hidden: !App.supports.hiveOozieExtraDatabases
+          foreignKeys: ['oozie_existing_postgresql_database', 'oozie_existing_postgresql_host']
         },
         {
           displayName: 'Existing Oracle Database',
-          foreignKeys: ['oozie_existing_oracle_database', 'oozie_existing_oracle_host'],
-          hidden: !App.supports.hiveOozieExtraDatabases
+          foreignKeys: ['oozie_existing_oracle_database', 'oozie_existing_oracle_host']
         }
       ],
       "description": "Current Derby Database will be installed by Ambari",
@@ -3730,7 +3721,6 @@ module.exports =
       "isReconfigurable": false,
       "displayType": "user",
       "isOverridable": false,
-      "isVisible": App.supports.customizeSmokeTestUser,
       "serviceName": "MISC",
       "filename": "cluster-env.xml",
       "category": "Users and Groups",

+ 4 - 14
ambari-web/app/data/HDP2/site_properties.js

@@ -2813,8 +2813,7 @@ module.exports =
         },
         {
           displayName: 'Existing Oracle Database',
-          foreignKeys: ['hive_existing_oracle_database', 'hive_existing_oracle_host'],
-          hidden: !App.supports.hiveOozieExtraDatabases
+          foreignKeys: ['hive_existing_oracle_database', 'hive_existing_oracle_host']
         }
       ],
       "description": "MySQL will be installed by Ambari",
@@ -3162,25 +3161,17 @@ module.exports =
           displayName: 'New Derby Database',
           foreignKeys: ['oozie_derby_database']
         },
-        /*{
-         displayName: 'New MySQL Database',
-         foreignKeys: ['oozie_ambari_database', 'oozie_ambari_host'],
-         hidden: !App.supports.hiveOozieExtraDatabases
-         },*/
         {
           displayName: 'Existing MySQL Database',
-          foreignKeys: ['oozie_existing_mysql_database', 'oozie_existing_mysql_host'],
-          hidden: !App.supports.hiveOozieExtraDatabases
+          foreignKeys: ['oozie_existing_mysql_database', 'oozie_existing_mysql_host']
         },
         {
           displayName: 'Existing PostgreSQL Database',
-          foreignKeys: ['oozie_existing_postgresql_database', 'oozie_existing_postgresql_host'],
-          hidden: !App.supports.hiveOozieExtraDatabases
+          foreignKeys: ['oozie_existing_postgresql_database', 'oozie_existing_postgresql_host']
         },
         {
           displayName: 'Existing Oracle Database',
-          foreignKeys: ['oozie_existing_oracle_database', 'oozie_existing_oracle_host'],
-          hidden: !App.supports.hiveOozieExtraDatabases
+          foreignKeys: ['oozie_existing_oracle_database', 'oozie_existing_oracle_host']
         }
       ],
       "description": "Current Derby Database will be installed by Ambari",
@@ -4035,7 +4026,6 @@ module.exports =
       "isReconfigurable": false,
       "displayType": "user",
       "isOverridable": false,
-      "isVisible": App.supports.customizeSmokeTestUser,
       "serviceName": "MISC",
       "filename": "cluster-env.xml",
       "category": "Users and Groups",

+ 3 - 53
ambari-web/app/data/site_properties.js

@@ -1631,8 +1631,7 @@ module.exports =
         },
         {
           displayName: 'Existing Oracle Database',
-          foreignKeys: ['hive_existing_oracle_database', 'hive_existing_oracle_host'],
-          hidden: !App.supports.hiveOozieExtraDatabases
+          foreignKeys: ['hive_existing_oracle_database', 'hive_existing_oracle_host']
         }
       ],
       "description": "MySQL will be installed by Ambari",
@@ -1949,8 +1948,7 @@ module.exports =
         },
         {
           displayName: 'Existing MySQL Database',
-          foreignKeys: ['oozie_existing_mysql_database', 'oozie_existing_mysql_host'],
-          hidden: !App.supports.hiveOozieExtraDatabases
+          foreignKeys: ['oozie_existing_mysql_database', 'oozie_existing_mysql_host']
         },
         {
           displayName: 'Existing PostgreSQL Database',
@@ -1958,8 +1956,7 @@ module.exports =
         },
         {
           displayName: 'Existing Oracle Database',
-          foreignKeys: ['oozie_existing_oracle_database', 'oozie_existing_oracle_host'],
-          hidden: !App.supports.hiveOozieExtraDatabases
+          foreignKeys: ['oozie_existing_oracle_database', 'oozie_existing_oracle_host']
         }
       ],
       "description": "Current Derby Database will be installed by Ambari",
@@ -2276,52 +2273,6 @@ module.exports =
       "category": "Advanced zookeeper-env",
       "index": 1
     },
-  /**********************************************HUE***************************************/
-    {
-      "id": "puppet var",
-      "name": "hueserver_host",
-      "displayName": "Hue Server host",
-      "value": "",
-      "defaultValue": "",
-      "description": "The host that has been assigned to run Hue Server",
-      "displayType": "masterHost",
-      "isRequiredByAgent": false,
-      "isOverridable": false,
-      "isVisible": true,
-      "serviceName": "HUE",
-      "filename": "hue-env.xml",
-      "category": "Hue Server"
-    },
-    {
-      "id": "puppet var",
-      "name": "hue_log_dir",
-      "displayName": "HUE Log Dir",
-      "description": "Directory for HUE logs",
-      "defaultValue": "/var/log/hue",
-      "isReconfigurable": false,
-      "displayType": "directory",
-      "isOverridable": false,
-      "isRequiredByAgent": false,
-      "isVisible": true,
-      "serviceName": "HUE",
-      "filename": "hue-env.xml",
-      "category": "Advanced hue-env"
-    },
-    {
-      "id": "puppet var",
-      "name": "hue_pid_dir",
-      "displayName": "HUE Pid Dir",
-      "description": "Directory in which the pid files for HUE processes will be created",
-      "defaultValue": "/var/run/hue",
-      "isReconfigurable": false,
-      "displayType": "directory",
-      "isOverridable": false,
-      "isRequiredByAgent": false,
-      "isVisible": true,
-      "serviceName": "HUE",
-      "filename": "hue-env.xml",
-      "category": "Advanced hue-env"
-    },
   /**********************************************GANGLIA***************************************/
     {
       "id": "puppet var",
@@ -2568,7 +2519,6 @@ module.exports =
       "isReconfigurable": false,
       "displayType": "user",
       "isOverridable": false,
-      "isVisible": App.supports.customizeSmokeTestUser,
       "serviceName": "MISC",
       "filename": "cluster-env.xml",
       "category": "Users and Groups",

+ 1 - 2
ambari-web/app/mappers/service_metrics_mapper.js

@@ -374,7 +374,7 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({
     }, this)
   },
   /**
-   * Map quick links to services:OOZIE,GANGLIA,NAGIOS,HUE
+   * Map quick links to services:OOZIE,GANGLIA,NAGIOS
    * @param finalJson
    * @param item
    */
@@ -384,7 +384,6 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({
       OOZIE: [19],
       GANGLIA: [20],
       NAGIOS: [21],
-      HUE: [22],
       STORM: [31],
       FALCON: [32]
     };

+ 14 - 17
ambari-web/app/mappers/stack_service_mapper.js

@@ -77,23 +77,20 @@ App.stackServiceMapper = App.QuickDataMapper.create({
     var stackServiceComponents = [];
     this.rearrangeServicesForDisplayOrder(json.items, App.StackService.displayOrder);
     json.items.forEach(function (item) {
-      //@TODO: Remove the condition when Flume becomes supported service in any stack
-      if (item.StackServices.service_name !== 'FLUME' || App.supports.flume) {
-        var stackService = item.StackServices;
-        var serviceComponents = [];
-        item.serviceComponents.forEach(function (serviceComponent) {
-          var dependencies = serviceComponent.dependencies.map(function(dependecy) {
-            return { Dependencies: App.keysUnderscoreToCamelCase(App.permit(dependecy.Dependencies, ['component_name', 'scope'])) };
-          });
-          serviceComponent.StackServiceComponents.id = serviceComponent.StackServiceComponents.component_name;
-          serviceComponent.StackServiceComponents.dependencies = dependencies;
-          serviceComponents.push(serviceComponent.StackServiceComponents);
-          stackServiceComponents.push(this.parseIt(serviceComponent.StackServiceComponents, this.get('component_config')));
-        }, this);
-        stackService.stack_id = stackService.stack_name + '-' + stackService.stack_version;
-        stackService.service_components = serviceComponents;
-        result.push(this.parseIt(stackService, this.get('config')));
-      }
+      var stackService = item.StackServices;
+      var serviceComponents = [];
+      item.serviceComponents.forEach(function (serviceComponent) {
+        var dependencies = serviceComponent.dependencies.map(function (dependecy) {
+          return { Dependencies: App.keysUnderscoreToCamelCase(App.permit(dependecy.Dependencies, ['component_name', 'scope'])) };
+        });
+        serviceComponent.StackServiceComponents.id = serviceComponent.StackServiceComponents.component_name;
+        serviceComponent.StackServiceComponents.dependencies = dependencies;
+        serviceComponents.push(serviceComponent.StackServiceComponents);
+        stackServiceComponents.push(this.parseIt(serviceComponent.StackServiceComponents, this.get('component_config')));
+      }, this);
+      stackService.stack_id = stackService.stack_name + '-' + stackService.stack_version;
+      stackService.service_components = serviceComponents;
+      result.push(this.parseIt(stackService, this.get('config')));
     }, this);
     App.store.loadMany(this.get('component_model'), stackServiceComponents);
     App.store.loadMany(model, result);

+ 0 - 4
ambari-web/app/messages.js

@@ -629,8 +629,6 @@ Em.I18n.translations = {
   'installer.step6.wizardStep6Host.title':'master components hosted on {0}',
   'installer.step6.addHostWizard.body':'Assign HBase master and ZooKeeper server.',
   'installer.step6.error.mustSelectOneForSlaveHost': 'You must assign at least one slave/client component to each host with no master component',
-  'installer.step6.validationIssuesAttention.header': 'Validation Issues',
-  'installer.step6.validationIssuesAttention': 'Slave and Client component assignments have issues that need attention.',
   'installer.step6.validationSlavesAndClients.hasIssues': 'Your slave and client assignment has issues. ',
   'installer.step6.validationSlavesAndClients.click': 'Click',
   'installer.step6.validationSlavesAndClients.forDetails': ' for details.',
@@ -1586,8 +1584,6 @@ Em.I18n.translations = {
   'services.oozie.clients': 'Oozie Clients',
   'services.oozie.webUi': 'Oozie Web UI',
 
-  'services.hue.webUi': 'Hue Web UI',
-
   'services.ganglia.webUi': 'Ganglia Web UI',
   'services.ganglia.monitors': 'Ganglia Monitors',
 

+ 5 - 9
ambari-web/app/mixins/common/serverValidator.js

@@ -99,7 +99,7 @@ App.ServerValidatorMixin = Em.Mixin.create({
    * @returns {*}
    */
   loadServerSideConfigsRecommendations: function() {
-    if (this.get('recommendationsConfigs') || !App.get('supports.serverRecommendValidate')) {
+    if (this.get('recommendationsConfigs')) {
       return $.Deferred().resolve();
     }
     return App.ajax.send({
@@ -136,15 +136,11 @@ App.ServerValidatorMixin = Em.Mixin.create({
 
   serverSideValidation: function () {
     var deferred = $.Deferred();
-    if (!App.get('supports.serverRecommendValidate')) {
-      deferred.resolve();
+    this.set('configValidationFailed', false);
+    if (this.get('configValidationFailed')) {
+      this.warnUser(deferred);
     } else {
-      this.set('configValidationFailed', false);
-      if (this.get('configValidationFailed')) {
-        this.warnUser(deferred);
-      } else {
-        this.runServerSideValidation(deferred);
-      }
+      this.runServerSideValidation(deferred);
     }
     return deferred;
   },

+ 0 - 2
ambari-web/app/models.js

@@ -51,8 +51,6 @@ require('models/background_operation');
 require('models/client_component');
 require('models/host_component');
 require('models/target_cluster');
-require('models/dataset');
-require('models/dataset_job');
 require('models/slave_component');
 require('classes/run_class');
 require('classes/job_class');

+ 0 - 7
ambari-web/app/models/quick_links.js

@@ -281,13 +281,6 @@ App.QuickLinks.FIXTURES = [
     service_id: 'NAGIOS',
     template:'%@://%@/nagios'
   },
-  {
-    id:22,
-    label:'Hue Web UI',
-    url:'%@://%@/hue',
-    service_id: 'HUE',
-    template:'%@://%@/hue'
-  },
   {
     id:23,
     label:'ResourceManager UI',

+ 0 - 13
ambari-web/app/models/service_config.js

@@ -450,9 +450,6 @@ App.ServiceConfigProperty = Ember.Object.extend({
       case 'webhcatserver_host':
         this.set('value', masterComponentHostsInDB.findProperty('component', 'WEBHCAT_SERVER').hostName);
         break;
-      case 'hueserver_host':
-        this.set('value', masterComponentHostsInDB.findProperty('component', 'HUE_SERVER').hostName);
-        break;
       case 'oozie_ambari_host':
         this.set('value', masterComponentHostsInDB.findProperty('component', 'OOZIE_SERVER').hostName);
         break;
@@ -886,16 +883,6 @@ App.ServiceConfigProperty = Ember.Object.extend({
         }
       }
     }
-    if (!App.get('supports.serverRecommendValidate')) {
-      var serviceValidator = this.get('serviceValidator');
-      if (serviceValidator!=null) {
-        var validationIssue = serviceValidator.validateConfig(this);
-        if (validationIssue) {
-          this.set('warnMessage', validationIssue);
-          isWarn = true;
-        }
-      }
-    }
 
     if (!isWarn || isError) { // Errors get priority
         this.set('warnMessage', '');

+ 1 - 2
ambari-web/app/models/stack_service.js

@@ -189,7 +189,6 @@ App.StackService.displayOrder = [
   'SQOOP',
   'OOZIE',
   'ZOOKEEPER',
-  'HUE',
   'FALCON',
   'STORM',
   'FLUME'
@@ -252,7 +251,7 @@ App.StackService.configCategories = function () {
         App.ServiceConfigCategory.create({ name: 'NODEMANAGER', displayName: 'Node Manager'}),
         App.ServiceConfigCategory.create({ name: 'APP_TIMELINE_SERVER', displayName: 'Application Timeline Server'}),
         App.ServiceConfigCategory.create({ name: 'General', displayName: 'General'}),
-        App.ServiceConfigCategory.create({ name: 'CapacityScheduler', displayName: 'Scheduler', isCustomView: true, siteFileName: 'capacity-scheduler.xml'})
+        App.ServiceConfigCategory.create({ name: 'CapacityScheduler', displayName: 'Scheduler', siteFileName: 'capacity-scheduler.xml'})
       ]);
       break;
     case 'MAPREDUCE2':

+ 0 - 35
ambari-web/app/models/stack_service_component.js

@@ -168,12 +168,6 @@ App.StackServiceComponent = DS.Model.extend({
     return this.get('minToInstall') == Infinity;
   }.property('stackService','isSlave'),
 
-  /** components that are not to be installed with ambari server **/
-  isNotPreferableOnAmbariServerHost: function() {
-    var service = ['STORM_UI_SERVER', 'DRPC_SERVER', 'STORM_REST_API', 'NIMBUS', 'GANGLIA_SERVER', 'NAGIOS_SERVER', 'HUE_SERVER'];
-    return service.contains(this.get('componentName'));
-  }.property('componentName'),
-
   /** @property {Number} defaultNoOfMasterHosts - default number of master hosts on Assign Master page: **/
   defaultNoOfMasterHosts: function() {
      if (this.get('isMasterAddableInstallerWizard')) {
@@ -181,10 +175,6 @@ App.StackServiceComponent = DS.Model.extend({
      }
   }.property('componentName'),
 
-  selectionSchemeForMasterComponent: function() {
-    return App.StackServiceComponent.selectionScheme(this.get('componentName'));
-  }.property('componentName'),
-
   /** @property {Boolean} coHostedComponents - components that are co-hosted with this component **/
   coHostedComponents: function() {
     var componentName = this.get('componentName');
@@ -212,31 +202,6 @@ App.StackServiceComponent = DS.Model.extend({
 
 App.StackServiceComponent.FIXTURES = [];
 
-App.StackServiceComponent.selectionScheme = function (componentName){
-  switch (componentName) {
-    case 'NAMENODE' :
-      return {"else": 0};
-    case 'SECONDARY_NAMENODE' :
-      return {"else": 1};
-    case 'HBASE_MASTER':
-      return {"6": 0, "31": 2, "else": 3};
-    case 'JOBTRACKER':
-    case 'HISTORYSERVER':
-    case 'RESOURCEMANAGER':
-    case 'APP_TIMELINE_SERVER':
-      return {"31": 1, "else": 2};
-    case 'OOZIE_SERVER':
-    case 'FALCON_SERVER' :
-      return {"6": 1, "31": 2, "else": 3};
-    case 'HIVE_SERVER' :
-    case 'HIVE_METASTORE' :
-    case 'WEBHCAT_SERVER' :
-      return {"6": 1, "31": 2, "else": 4};
-    default:
-      return {"else": 0};
-  }
-};
-
 App.StackServiceComponent.coHost = {
   'HIVE_METASTORE': 'HIVE_SERVER',
   'WEBHCAT_SERVER': 'HIVE_SERVER'

+ 1 - 1
ambari-web/app/models/user.js

@@ -67,7 +67,7 @@ App.EditUserForm = App.Form.extend({
   disableAdminCheckbox:function () {
     var object = this.get('object');
     if (object) {
-      if ((object.get('userName') == App.get('router').getLoginName()) || App.get('supports.ldapGroupMapping') && object.get("isLdap")) {
+      if (object.get('userName') == App.get('router').getLoginName()) {
         this.getField("admin").set("disabled", true);
       } else {
         this.getField("admin").set("disabled", false);

+ 1 - 5
ambari-web/app/routes/add_host_routes.js

@@ -197,11 +197,7 @@ module.exports = App.WizardRoute.extend({
       wizardStep6Controller.callValidation(function() {
         wizardStep6Controller.showValidationIssuesAcceptBox(function() {
           addHostController.saveSlaveComponentHosts(wizardStep6Controller);
-          if(App.supports.hostOverrides){
-            router.transitionTo('step4');
-          }else{
-            router.transitionTo('step5');
-          }
+          router.transitionTo('step4');
         });
       });
     }

+ 1 - 3
ambari-web/app/routes/add_service_routes.js

@@ -211,9 +211,7 @@ module.exports = App.WizardRoute.extend({
       var addServiceController = router.get('addServiceController');
       var wizardStep7Controller = router.get('wizardStep7Controller');
       addServiceController.saveServiceConfigProperties(wizardStep7Controller);
-      if (App.supports.hostOverrides) {
-        addServiceController.saveServiceConfigGroups(wizardStep7Controller, true);
-      }
+      addServiceController.saveServiceConfigGroups(wizardStep7Controller, true);
       router.transitionTo('step5');
     }
   }),

+ 1 - 3
ambari-web/app/routes/installer.js

@@ -323,9 +323,7 @@ module.exports = Em.Route.extend({
       var controller = router.get('installerController');
       var wizardStep7Controller = router.get('wizardStep7Controller');
       controller.saveServiceConfigProperties(wizardStep7Controller);
-      if (App.supports.hostOverridesInstaller) {
-        controller.saveServiceConfigGroups(wizardStep7Controller);
-      }
+      controller.saveServiceConfigGroups(wizardStep7Controller);
       controller.setDBProperty('recommendationsConfigs', wizardStep7Controller.get('recommendationsConfigs'));
       router.transitionTo('step8');
     }

+ 2 - 6
ambari-web/app/routes/main.js

@@ -140,12 +140,8 @@ module.exports = Em.Route.extend({
     configHistory: Em.Route.extend({
       route: '/config_history',
       connectOutlets: function (router, context) {
-        if (App.get('supports.configHistory')) {
-          router.set('mainDashboardController.selectedCategory', 'configHistory');
-          router.get('mainDashboardController').connectOutlet('mainConfigHistory');
-        } else {
-          router.transitionTo('main.dashboard.widgets');
-        }
+        router.set('mainDashboardController.selectedCategory', 'configHistory');
+        router.get('mainDashboardController').connectOutlet('mainConfigHistory');
       }
     }),
     goToServiceConfigs: function (router, event) {

+ 0 - 101
ambari-web/app/templates/common/configs/capacity_scheduler.hbs

@@ -1,101 +0,0 @@
-{{!
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements.  See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership.  The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License.  You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-}}
-
-<div class="accordion-heading" {{action "onToggleBlock" view.category target="view"}}>
-    <i class="pull-left accordion-toggle" {{bindAttr class="view.category.isCollapsed:icon-caret-right:icon-caret-down "}}></i>
-    <a class="accordion-toggle">{{view.category.displayName}}</a>
-</div>
-
-<div {{bindAttr id="view.category.name"}} class="accordion-body collapse in">
-    <div class="accordion-inner capacity-scheduler">
-        <div class="row-fluid header">
-            <div class="span1">{{t services.mapReduce.config.queue.header}}</div>
-            <div class="offset9 span2">
-                {{#if view.canEdit}}
-                    <div class="btn pull-right" {{action queuePopup target="view"}}>{{t services.mapReduce.config.addQueue}}</div>
-                {{/if}}
-            </div>
-        </div>
-        <div>
-            <table class="table table-bordered table-striped">
-                <thead>
-                <tr>
-                    {{#each header in view.tableHeaders}}
-                      <th>{{header}}</th>
-                    {{/each}}
-                </tr>
-                </thead>
-                <tbody>
-                  {{#each queue in view.tableContent}}
-                  <tr {{action queuePopup queue.name target="view"}}>
-                      <td><a href="javascript:void(0)">
-                          <i {{bindAttr style="queue.color"}} class="marker"></i>{{queue.name}}</a>
-                      </td>
-                      {{#each config in queue.configs}}
-                        <td>{{config.value}}</td>
-                      {{/each}}
-                  </tr>
-                  {{/each}}
-                </tbody>
-            </table>
-        </div>
-        <div class="row-fluid">
-            <div class="span8">
-                <div><strong>{{t common.advanced}}</strong></div>
-                <form class="form-horizontal" autocomplete="off">
-                  {{#each view.advancedConfigs}}
-                    {{#if isVisible}}
-                        <div class="row-fluid">
-                            <div {{bindAttr class="errorMessage:error :control-label-span :span4"}}>
-                                <label>{{displayName}}</label>
-                            </div>
-                            <div class="span8">
-                                <div {{bindAttr class="errorMessage:error: :control-group"}}>
-                                  {{view viewClass serviceConfigBinding="this" categoryConfigsBinding="view.categoryConfigs" }}
-                                  {{#if view.canEdit}}
-                                      {{#if App.isAdmin}}
-                                        {{#if isRemovable}}
-                                            <a class="action" {{action "removeProperty" this target="view" }} ><i class="icon-minus-sign"></i>{{t common.remove}}</a>
-                                        {{/if}}
-                                      {{/if}}
-                                  {{/if}}
-                                    <span class="help-inline">{{errorMessage}}</span>
-                                </div>
-                            </div>
-                        </div>
-                    {{/if}}
-                  {{/each}}
-                </form>
-            </div>
-            <div class="span4">
-                <div class="frame">
-                  <div id="section_label"></div>
-                  {{view view.pieChart queuesBinding="view.queues"}}
-                </div>
-            </div>
-        </div>
-      {{! For Advanced, Advanced Core Site, Advanced HDFS Site sections, show the 'Add Property' link.}}
-      {{#if view.canEdit}}
-          {{#if view.category.customCanAddProperty }}
-              <div>
-                  <a href="#" {{action "showAddPropertyWindow" this target="view" }} >{{t installer.step7.config.addProperty}}...</a>
-              </div>
-          {{/if}}
-      {{/if}}
-    </div>
-</div>

+ 2 - 6
ambari-web/app/templates/common/configs/service_config.hbs

@@ -84,13 +84,9 @@
 {{#if versionLoaded}}
     <div class="accordion">
       {{#each category in selectedService.configCategories}}
-        {{#if category.isCustomView}}
-          {{#if App.supports.capacitySchedulerUi}}
-            {{view category.customView categoryBinding="category" serviceBinding="selectedService" canEditBinding="view.canEdit" serviceConfigsBinding="selectedService.configs"}}
-          {{/if}}
-        {{else}}
+        {{#unless category.isCustomView}}
           {{view App.ServiceConfigsByCategoryView categoryBinding="category" canEditBinding="view.canEdit" serviceBinding="selectedService" serviceConfigsBinding="selectedService.configs" supportsHostOverridesBinding="view.supportsHostOverrides"}}
-        {{/if}}
+        {{/unless}}
       {{/each}}
     </div>
 {{else}}

+ 5 - 5
ambari-web/app/templates/common/configs/service_config_category.hbs

@@ -31,14 +31,14 @@
             <span {{bindAttr class="errorMessage:error: :control-group :control-label-span"}}>
               <label class="control-label">
                 {{formatWordBreak displayName}}
-                {{#if App.supports.secureCluster}}
-                  {{#if isSecureConfig}}
-                    <a href="javascript:void(null);"><i class="icon-lock" rel="tooltip" data-toggle="tooltip" title="security knob"></i></a>
-                  {{/if}}
+                {{#if isSecureConfig}}
+                  <a href="javascript:void(null);"><i class="icon-lock" rel="tooltip" data-toggle="tooltip"
+                                                      title="security knob"></i></a>
                 {{/if}}
                 {{#if view.supportsHostOverrides}}
                   {{#if isRestartRequired}}
-                    <i class="icon-refresh restart-required-property" rel="tooltip" {{bindAttr title="restartRequiredMessage"}}></i>
+                    <i class="icon-refresh restart-required-property"
+                       rel="tooltip" {{bindAttr title="restartRequiredMessage"}}></i>
                   {{/if}}
                 {{/if}}
               </label>

+ 126 - 118
ambari-web/app/templates/common/host_progress_popup.hbs

@@ -18,60 +18,59 @@
 
 <div class="host-component-popup-wrap">
 
-    {{#if view.parentView.isLoaded}}
-    {{!-- SERVICES --}}
-
-    <div {{bindAttr class="view.parentView.isServiceListHidden:hidden :task-list-main-warp"}}>
-      <div class="task-top-wrap">
-        <div class="operation-name-top">{{t common.operations}}</div>
-        <div class="start-time-top">{{t common.startTime}}</div>
-        <div class="duration-top">{{t common.duration}}</div>
-        <div class="select-wrap">
-          {{t common.show}}:
-          {{view Ember.Select
-            contentBinding="view.categories"
-            optionValuePath="content.value"
-            optionLabelPath="content.label"
-            selectionBinding="view.serviceCategory"
-          }}
-        </div>
+{{#if view.parentView.isLoaded}}
+{{!-- SERVICES --}}
+
+  <div {{bindAttr class="view.parentView.isServiceListHidden:hidden :task-list-main-warp"}}>
+    <div class="task-top-wrap">
+      <div class="operation-name-top">{{t common.operations}}</div>
+      <div class="start-time-top">{{t common.startTime}}</div>
+      <div class="duration-top">{{t common.duration}}</div>
+      <div class="select-wrap">
+        {{t common.show}}:
+        {{view Ember.Select
+        contentBinding="view.categories"
+        optionValuePath="content.value"
+        optionLabelPath="content.label"
+        selectionBinding="view.serviceCategory"
+        }}
       </div>
-      <div id="service-info">
-        {{#if view.isServiceEmptyList}}
-          <div class="log-list-wrap">{{t hostPopup.noServicesToShow}}</div>
-        {{else}}
-          {{#each servicesInfo in view.services}}
-            <div {{bindAttr class="servicesInfo.isVisible::hidden :log-list-wrap"}}>
-              <div {{action gotoHosts servicesInfo}} class="task-list-line-cursor">
-                <div class="operation-name-icon-wrap">
-                  {{view statusIcon servicesInfoBinding="servicesInfo"}}
-                  <a href="#">
-                    {{servicesInfo.name}}
-                  </a>
-                  {{#if App.supports.abortRequests}}
-                    {{#if servicesInfo.isAbortable}}
-                        {{view abortIcon servicesInfoBinding="servicesInfo"}}
-                    {{/if}}
-                  {{/if}}
-                </div>
-                <div class="time-summary start-time-text">{{servicesInfo.startTime}}</div>
-                <div class="time-summary duration-text">{{servicesInfo.duration}}</div>
-                <div class="progress-bar span2">
-                  <div {{bindAttr class="servicesInfo.isInProgress:progress-striped servicesInfo.isInProgress:active servicesInfo.barColor :progress"}}>
-                    <div class="bar" {{bindAttr style="servicesInfo.barWidth"}}></div>
-                  </div>
+    </div>
+    <div id="service-info">
+      {{#if view.isServiceEmptyList}}
+        <div class="log-list-wrap">{{t hostPopup.noServicesToShow}}</div>
+      {{else}}
+        {{#each servicesInfo in view.services}}
+          <div {{bindAttr class="servicesInfo.isVisible::hidden :log-list-wrap"}}>
+            <div {{action gotoHosts servicesInfo}} class="task-list-line-cursor">
+              <div class="operation-name-icon-wrap">
+                {{view statusIcon servicesInfoBinding="servicesInfo"}}
+                <a href="#">
+                  {{servicesInfo.name}}
+                </a>
+                {{#if servicesInfo.isAbortable}}
+                  {{view abortIcon servicesInfoBinding="servicesInfo"}}
+                {{/if}}
+              </div>
+              <div class="time-summary start-time-text">{{servicesInfo.startTime}}</div>
+              <div class="time-summary duration-text">{{servicesInfo.duration}}</div>
+              <div class="progress-bar span2">
+                <div {{bindAttr class="servicesInfo.isInProgress:progress-striped servicesInfo.isInProgress:active servicesInfo.barColor :progress"}}>
+                  <div class="bar" {{bindAttr style="servicesInfo.barWidth"}}></div>
                 </div>
-                <div class="host-progress-num">{{servicesInfo.progress}}%</div>
-                <div class="show-details"><i class="icon-caret-right"></i></div>
               </div>
+              <div class="host-progress-num">{{servicesInfo.progress}}%</div>
+              <div class="show-details"><i class="icon-caret-right"></i></div>
             </div>
-          {{/each}}
-        {{/if}}
-        {{#if view.isShowMore}}
-            <div class="show-more" {{action requestMoreOperations}}><a href="#">{{t hostPopup.serviceInfo.showMore}}</a></div>
-        {{/if}}
-      </div>
+          </div>
+        {{/each}}
+      {{/if}}
+      {{#if view.isShowMore}}
+        <div class="show-more" {{action requestMoreOperations}}><a href="#">{{t hostPopup.serviceInfo.showMore}}</a>
+        </div>
+      {{/if}}
     </div>
+  </div>
 
 
   {{!-- HOSTS ---}}
@@ -83,14 +82,15 @@
           <i class="icon-arrow-left"></i>&nbsp;{{t common.operations}}
         </a>
       {{/if}}
-      <span class="task-detail-log-rolename" >{{t common.hosts}}</span>
+      <span class="task-detail-log-rolename">{{t common.hosts}}</span>
+
       <div class="select-wrap">
         {{t common.show}}:
         {{view Ember.Select
-          contentBinding="view.categories"
-          optionValuePath="content.value"
-          optionLabelPath="content.label"
-          selectionBinding="view.hostCategory"
+        contentBinding="view.categories"
+        optionValuePath="content.value"
+        optionLabelPath="content.label"
+        selectionBinding="view.hostCategory"
         }}
       </div>
     </div>
@@ -111,31 +111,31 @@
       {{/if}}
     {{/if}}
     {{#if view.isLevelLoaded}}
-        <div id="host-info" {{bindAttr class="view.isRequestSchedule:scheduled"}}>
-          {{#if view.isHostEmptyList}}
-              <div class="log-list-wrap">{{t hostPopup.noHostsToShow}}</div>
-          {{else}}
-            {{#each hostInfo in view.pageContent}}
-                <div {{bindAttr class="hostInfo.isVisible::hidden :log-list-wrap"}}>
-                    <div {{action gotoTasks hostInfo}} class="task-list-line-cursor">
-                        <div class="host-name-icon-wrap">
-                          {{view statusIcon servicesInfoBinding="hostInfo"}}
-                            <a href="#">
-                              {{hostInfo.displayName}}
-                            </a>
-                        </div>
-                        <div class="progress-bar span2">
-                            <div {{bindAttr class="hostInfo.isInProgress:progress-striped :active hostInfo.barColor :progress"}}>
-                                <div class="bar" {{bindAttr style="hostInfo.barWidth"}}></div>
-                            </div>
-                        </div>
-                        <div class="host-progress-num">{{hostInfo.progress}}%</div>
-                        <div class="show-details"><i class="icon-caret-right"></i></div>
-                    </div>
+      <div id="host-info" {{bindAttr class="view.isRequestSchedule:scheduled"}}>
+        {{#if view.isHostEmptyList}}
+          <div class="log-list-wrap">{{t hostPopup.noHostsToShow}}</div>
+        {{else}}
+          {{#each hostInfo in view.pageContent}}
+            <div {{bindAttr class="hostInfo.isVisible::hidden :log-list-wrap"}}>
+              <div {{action gotoTasks hostInfo}} class="task-list-line-cursor">
+                <div class="host-name-icon-wrap">
+                  {{view statusIcon servicesInfoBinding="hostInfo"}}
+                  <a href="#">
+                    {{hostInfo.displayName}}
+                  </a>
                 </div>
-            {{/each}}
-          {{/if}}
-        </div>
+                <div class="progress-bar span2">
+                  <div {{bindAttr class="hostInfo.isInProgress:progress-striped :active hostInfo.barColor :progress"}}>
+                    <div class="bar" {{bindAttr style="hostInfo.barWidth"}}></div>
+                  </div>
+                </div>
+                <div class="host-progress-num">{{hostInfo.progress}}%</div>
+                <div class="show-details"><i class="icon-caret-right"></i></div>
+              </div>
+            </div>
+          {{/each}}
+        {{/if}}
+      </div>
     {{else}}
       <div class="spinner"></div>
     {{/if}}
@@ -146,15 +146,17 @@
 
   <div {{bindAttr class="view.parentView.isTaskListHidden:hidden :task-list-main-warp"}}>
     <div class="task-top-wrap">
-      <a class="task-detail-back-to-hosts" href="javascript:void(null)" {{action backToHostList}} ><i class="icon-arrow-left"></i>&nbsp;{{t common.hosts}}</a>
+      <a class="task-detail-back-to-hosts" href="javascript:void(null)" {{action backToHostList}} ><i
+              class="icon-arrow-left"></i>&nbsp;{{t common.hosts}}</a>
+
       <div class="task-name-top task-detail-log-rolename">{{t common.tasks}}</div>
       <div class="select-wrap tasks-list-select">
         {{t common.show}}:
         {{view Ember.Select
-          contentBinding="view.categories"
-          optionValuePath="content.value"
-          optionLabelPath="content.label"
-          selectionBinding="view.taskCategory"
+        contentBinding="view.categories"
+        optionValuePath="content.value"
+        optionLabelPath="content.label"
+        selectionBinding="view.taskCategory"
         }}
       </div>
     </div>
@@ -184,54 +186,60 @@
 
   <div {{bindAttr class="view.parentView.isLogWrapHidden:hidden :task-detail-info"}}>
     <div class="task-top-wrap">
-      <a class="task-detail-back" href="javascript:void(null)" {{action backToTaskList}} ><i class="icon-arrow-left"></i>&nbsp;{{t common.tasks}}</a>
+      <a class="task-detail-back" href="javascript:void(null)" {{action backToTaskList}} ><i
+              class="icon-arrow-left"></i>&nbsp;{{t common.tasks}}</a>
+
       <div>
         <i {{bindAttr class="view.openedTask.status :task-detail-status-ico view.openedTask.icon"}}></i>
+
         <div class="task-detail-ico-wrap">
-          <a title="Click to Copy" {{action "textTrigger" taskInfo target="view"}} class="task-detail-copy"><i class="icon-copy"></i> {{t common.copy}}</a>
-          <a title="Open in New Window" {{action openTaskLogInDialog}} class="task-detail-open-dialog"><i class="icon-external-link"></i> {{t common.open}}</a>
+          <a title="Click to Copy" {{action "textTrigger" taskInfo target="view"}} class="task-detail-copy"><i
+                  class="icon-copy"></i> {{t common.copy}}</a>
+          <a title="Open in New Window" {{action openTaskLogInDialog}} class="task-detail-open-dialog"><i
+                  class="icon-external-link"></i> {{t common.open}}</a>
         </div>
-        <span class="task-detail-log-rolename" >{{view.openedTask.commandDetail}}</span>
+        <span class="task-detail-log-rolename">{{view.openedTask.commandDetail}}</span>
       </div>
     </div>
     {{#if view.isLevelLoaded}}
-        <div class="task-detail-log-info">
-            <div class="content-area">
-                <div class="task-detail-log-clipboard-wrap"></div>
-                <div class="task-detail-log-maintext">  
-                    {{#if view.openedTask.isRebalanceHDFSTask }}
-                      <h5>{{t services.hdfs.rebalance.title}}</h5>
-                      <div class="progresspopup-rebalancehdfs">
-                        <div {{bindAttr class=":progress view.openedTask.isInProgress:progress-striped view.openedTask.barColor :active"}}>
-                          <div class="bar" {{bindAttr style="view.openedTask.completionProgressStyle"}}></div>
-                        </div>
-                      </div>
-                      <div class="clearfix">
-                        <div class="pull-left">
-                          {{view.openedTask.dataMoved}} moved /
-                          {{view.openedTask.dataLeft}} left /
-                          {{view.openedTask.dataBeingMoved}} being processed
-                        </div>
-                        {{#if view.openedTask.isNotComplete}}
-                          <button class="btn btn-danger pull-right" {{action stopRebalanceHDFS}}>{{t common.cancel}}</button>
-                        {{/if}}
-                      </div>
-                      <hr>
-                    {{/if}}
-                    <h5>stderr: &nbsp; <span class="muted">{{view.openedTask.errorLog}} </span></h5>
-                    <pre class="stderr">{{view.openedTask.stderr}}</pre>
-                    <h5>stdout: &nbsp; <span class="muted"> {{view.openedTask.outputLog}} </span></h5>
-                    <pre class="stdout">{{view.openedTask.stdout}}</pre>
+      <div class="task-detail-log-info">
+        <div class="content-area">
+          <div class="task-detail-log-clipboard-wrap"></div>
+          <div class="task-detail-log-maintext">
+            {{#if view.openedTask.isRebalanceHDFSTask }}
+              <h5>{{t services.hdfs.rebalance.title}}</h5>
+
+              <div class="progresspopup-rebalancehdfs">
+                <div {{bindAttr class=":progress view.openedTask.isInProgress:progress-striped view.openedTask.barColor :active"}}>
+                  <div class="bar" {{bindAttr style="view.openedTask.completionProgressStyle"}}></div>
                 </div>
-            </div>
+              </div>
+              <div class="clearfix">
+                <div class="pull-left">
+                  {{view.openedTask.dataMoved}} moved /
+                  {{view.openedTask.dataLeft}} left /
+                  {{view.openedTask.dataBeingMoved}} being processed
+                </div>
+                {{#if view.openedTask.isNotComplete}}
+                  <button class="btn btn-danger pull-right" {{action stopRebalanceHDFS}}>{{t common.cancel}}</button>
+                {{/if}}
+              </div>
+              <hr>
+            {{/if}}
+            <h5>stderr: &nbsp; <span class="muted">{{view.openedTask.errorLog}} </span></h5>
+            <pre class="stderr">{{view.openedTask.stderr}}</pre>
+            <h5>stdout: &nbsp; <span class="muted"> {{view.openedTask.outputLog}} </span></h5>
+            <pre class="stdout">{{view.openedTask.stdout}}</pre>
+          </div>
         </div>
+      </div>
     {{else}}
       <div class="spinner"></div>
     {{/if}}
   </div>
-    {{else}}
-      <div class="spinner"></div>
-    {{/if}}
+{{else}}
+  <div class="spinner"></div>
+{{/if}}
 </div>
 {{#if view.isPaginate}}
   <div class="page-bar pull-right no-borders mtm">

+ 1 - 3
ambari-web/app/templates/main/host/add.hbs

@@ -31,9 +31,7 @@
               <li {{bindAttr class="isStep1:active view.isStep1Disabled:disabled"}}><a href="javascript:void(null);"  {{action gotoStep1 target="controller"}}>{{t installer.step2.header}}</a></li>
               <li {{bindAttr class="isStep2:active view.isStep2Disabled:disabled"}}><a href="javascript:void(null);"  {{action gotoStep2 target="controller"}}>{{t installer.step3.header}}</a></li>
               <li {{bindAttr class="isStep3:active view.isStep3Disabled:disabled"}}><a href="javascript:void(null);"  {{action gotoStep3 target="controller"}}>{{t installer.step6.header}}</a></li>
-              {{#if App.supports.hostOverrides}}
-                <li {{bindAttr class="isStep4:active view.isStep4Disabled:disabled"}}><a href="javascript:void(null);"  {{action gotoStep4 target="controller"}}>{{t addHost.step4.header}}</a></li>
-              {{/if}}
+              <li {{bindAttr class="isStep4:active view.isStep4Disabled:disabled"}}><a href="javascript:void(null);"  {{action gotoStep4 target="controller"}}>{{t addHost.step4.header}}</a></li>
               <li {{bindAttr class="isStep5:active view.isStep5Disabled:disabled"}}><a href="javascript:void(null);"  {{action gotoStep5 target="controller"}}>{{t installer.step8.header}}</a></li>
               <li {{bindAttr class="isStep6:active view.isStep6Disabled:disabled"}}><a href="javascript:void(null);"  {{action gotoStep6 target="controller"}}>{{t installer.step9.header}}</a></li>
               <li {{bindAttr class="isStep7:active view.isStep7Disabled:disabled"}}><a href="javascript:void(null);"  {{action gotoStep7 target="controller"}}>{{t installer.step10.header}}</a></li>

+ 53 - 53
ambari-web/app/templates/main/host/details.hbs

@@ -17,60 +17,60 @@
 }}
 
 {{#if view.isLoaded}}
-    <div id="host-details">
-        <div class="status-info">
-            <span rel="HealthTooltip" {{bindAttr class="view.content.healthClass view.content.healthIconClass"}} {{bindAttr data-original-title="view.content.healthToolTip" }}></span><span class='host-title'>{{unbound view.content.publicHostName}}</span>
-          {{#if view.content.criticalAlertsCount}}
-              <span class="label label-important alerts-count" {{action "showAlertsPopup" content target="App.router.mainHostController"}}>{{view.content.criticalAlertsCount}}</span>
-          {{else}}
-              <span class="label label-success alerts-count" {{action "showAlertsPopup" content target="App.router.mainHostController"}}>{{t hosts.host.alert.noAlerts}}</span>
-          {{/if}}
-          {{#unless view.isActive}}
-              <span class="host-maintenance-notice pull-right"><span class="icon-medkit"></span> {{t hosts.host.passive.mode}}</span>
-          {{/unless}}
-        </div>
-        <div><a href="javascript:void(null)" data-toggle="modal" {{action back}}><i class="icon-arrow-left"></i>&nbsp;{{t common.back}}</a></div>
-        <div class="content">
-          {{view App.MainHostMenuView}}
-          {{#if App.isAdmin}}
-            {{#if App.supports.deleteHost}}
-                <div class="service-button">
-                    <div class="btn-group display-inline-block">
-                        <a href="javascript:void(null)" {{bindAttr class=":btn :dropdown-toggle"}} data-toggle="dropdown">
-                          {{t hosts.host.details.hostActions}}
-                            <span class="caret"></span>
-                        </a>
-                        <ul class="dropdown-menu pull-right">
-                            <!-- dropdown menu links -->
-                          {{#each option in view.maintenance}}
-                              <li {{bindAttr class="controller.isStopDisabled:disabled option.liClass"}}>
-                                  <a {{action "doAction" option target="controller" href=true}}><i {{bindAttr class="option.cssClass option.liClass"}}></i> {{option.label}}</a>
-                              </li>
-                          {{/each}}
-                          {{#if App.supports.downloadClientConfigs}}
-                            {{#if view.clients}}
-                              <li class="dropdown-submenu submenu-left">
-                                <a><i class="icon-download-alt"></i> {{t services.service.actions.downloadClientConfigs}}</a>
-                                <div class="dropdown-menu-wrap">
-                                  <ul class="dropdown-menu">
-                                    {{#each client in view.clientsWithConfigs}}
-                                      <li>
-                                        <a {{action "downloadClientConfigs" client target="controller" href=true}}>{{client.displayName}}</a>
-                                      </li>
-                                    {{/each}}
-                                  </ul>
-                                </div>
-                              </li>
-                            {{/if}}
-                          {{/if}}
-                        </ul>
-                    </div>
-                </div>
-            {{/if}}
-          {{/if}}
-          {{outlet}}
+  <div id="host-details">
+    <div class="status-info">
+      <span rel="HealthTooltip" {{bindAttr class="view.content.healthClass view.content.healthIconClass"}} {{bindAttr data-original-title="view.content.healthToolTip" }}></span><span
+            class='host-title'>{{unbound view.content.publicHostName}}</span>
+      {{#if view.content.criticalAlertsCount}}
+        <span class="label label-important alerts-count" {{action "showAlertsPopup" content target="App.router.mainHostController"}}>{{view.content.criticalAlertsCount}}</span>
+      {{else}}
+        <span class="label label-success alerts-count" {{action "showAlertsPopup" content target="App.router.mainHostController"}}>{{t hosts.host.alert.noAlerts}}</span>
+      {{/if}}
+      {{#unless view.isActive}}
+        <span class="host-maintenance-notice pull-right"><span class="icon-medkit"></span> {{t hosts.host.passive.mode}}</span>
+      {{/unless}}
+    </div>
+    <div><a href="javascript:void(null)" data-toggle="modal" {{action back}}><i
+            class="icon-arrow-left"></i>&nbsp;{{t common.back}}</a></div>
+    <div class="content">
+      {{view App.MainHostMenuView}}
+      {{#if App.isAdmin}}
+        <div class="service-button">
+          <div class="btn-group display-inline-block">
+            <a href="javascript:void(null)" {{bindAttr class=":btn :dropdown-toggle"}} data-toggle="dropdown">
+              {{t hosts.host.details.hostActions}}
+              <span class="caret"></span>
+            </a>
+            <ul class="dropdown-menu pull-right">
+              <!-- dropdown menu links -->
+              {{#each option in view.maintenance}}
+                <li {{bindAttr class="controller.isStopDisabled:disabled option.liClass"}}>
+                  <a {{action "doAction" option target="controller" href=true}}><i {{bindAttr class="option.cssClass option.liClass"}}></i> {{option.label}}
+                  </a>
+                </li>
+              {{/each}}
+              {{#if view.clients}}
+                <li class="dropdown-submenu submenu-left">
+                  <a><i class="icon-download-alt"></i> {{t services.service.actions.downloadClientConfigs}}</a>
+
+                  <div class="dropdown-menu-wrap">
+                    <ul class="dropdown-menu">
+                      {{#each client in view.clientsWithConfigs}}
+                        <li>
+                          <a {{action "downloadClientConfigs" client target="controller" href=true}}>{{client.displayName}}</a>
+                        </li>
+                      {{/each}}
+                    </ul>
+                  </div>
+                </li>
+              {{/if}}
+            </ul>
+          </div>
         </div>
+      {{/if}}
+      {{outlet}}
     </div>
+  </div>
 {{else}}
-    <div class="spinner"></div>
+  <div class="spinner"></div>
 {{/if}}

+ 0 - 4
ambari-web/app/templates/main/service/all_services_actions.hbs

@@ -23,7 +23,6 @@
         <span class="caret"></span>
       </a>
       <ul class="pull-left dropdown-menu">
-        {{#if App.supports.addServices}}
           <li {{bindAttr class="controller.isAllServicesInstalled:disabled"}}>
             <a href="#"
               {{bindAttr class="controller.isAllServicesInstalled:disabled"}}
@@ -31,8 +30,6 @@
               <i class="icon-plus icon-white"></i> {{t services.service.add}}</a>
           </li>
           <li class="divider"></li>
-        {{/if}}
-        {{#if App.supports.startStopAllServices}}
           <li {{bindAttr class="controller.isStartAllDisabled:disabled" }}>
             <a href="#" data-toggle="modal"
               {{bindAttr class="controller.isStartAllDisabled:disabled" }}
@@ -49,7 +46,6 @@
               {{t services.service.stopAll}}
             </a>
           </li>
-        {{/if}}
       </ul>
     </div>
   </div>

+ 25 - 20
ambari-web/app/templates/main/service/info/configs.hbs

@@ -18,28 +18,33 @@
 
 <div id="serviceConfig">
   {{#if dataIsLoaded}}
-    {{#if App.supports.hostOverrides}}
-      {{#if controller.content.isRestartRequired}}
-        {{#if App.isAdmin}}
-          <div>
-            <div class="alert alert-warning clearfix">
-              <i class="icon-refresh"></i> {{t services.service.config.restartService.needToRestart}}  <a href="#" {{action showComponentsShouldBeRestarted target="controller"}}>{{view.componentsCount}} {{pluralize view.componentsCount singular="t:common.component" plural="t:common.components"}}</a> {{t on}} <a href="#" {{action showHostsShouldBeRestarted target="controller"}}>{{view.hostsCount}} {{pluralize view.hostsCount singular="t:common.host" plural="t:common.hosts"}}</a>
-              <span class="restart-components pull-right">&nbsp</span>
-              <div class="btn-group pull-right">
-                <button type="button" class="btn btn-default dropdown-toggle btn-warning" data-toggle="dropdown">
-                  {{t hosts.host.details.needToRestart.button}}
-                  <span class="caret"></span>
-                </button>
-                <ul class="dropdown-menu">
-                  <li><a href="#" {{action restartAllStaleConfigComponents target="controller"}}>{{t restart.service.all}}</a></li>
-                  {{#if view.rollingRestartSlaveComponentName}}
-                    <li><a href="#" {{action rollingRestartStaleConfigSlaveComponents view.rollingRestartSlaveComponentName target="controller"}}>{{view.rollingRestartActionName}}</a></li>
-                  {{/if}}
-                </ul>
-              </div>
+    {{#if controller.content.isRestartRequired}}
+      {{#if App.isAdmin}}
+        <div>
+          <div class="alert alert-warning clearfix">
+            <i class="icon-refresh"></i> {{t services.service.config.restartService.needToRestart}}  <a
+                  href="#" {{action showComponentsShouldBeRestarted target="controller"}}>{{view.componentsCount}} {{pluralize view.componentsCount singular="t:common.component" plural="t:common.components"}}</a> {{t on}}
+            <a href="#" {{action showHostsShouldBeRestarted target="controller"}}>{{view.hostsCount}} {{pluralize view.hostsCount singular="t:common.host" plural="t:common.hosts"}}</a>
+            <span class="restart-components pull-right">&nbsp</span>
+
+            <div class="btn-group pull-right">
+              <button type="button" class="btn btn-default dropdown-toggle btn-warning" data-toggle="dropdown">
+                {{t hosts.host.details.needToRestart.button}}
+                <span class="caret"></span>
+              </button>
+              <ul class="dropdown-menu">
+                <li>
+                  <a href="#" {{action restartAllStaleConfigComponents target="controller"}}>{{t restart.service.all}}</a>
+                </li>
+                {{#if view.rollingRestartSlaveComponentName}}
+                  <li>
+                    <a href="#" {{action rollingRestartStaleConfigSlaveComponents view.rollingRestartSlaveComponentName target="controller"}}>{{view.rollingRestartActionName}}</a>
+                  </li>
+                {{/if}}
+              </ul>
             </div>
           </div>
-        {{/if}}
+        </div>
       {{/if}}
     {{/if}}
     <div class="clearfix"></div>

+ 64 - 55
ambari-web/app/templates/main/service/info/summary.hbs

@@ -16,28 +16,31 @@
 * limitations under the License.
 }}
 
-{{#if App.supports.hostOverrides}}
-  {{#if view.service.isRestartRequired}}
-    {{#if App.isAdmin}}
-      <div id="summary-restart-bar">
-        <div class="alert alert-warning clearfix">
-          <i class="icon-refresh"></i> {{{view.needToRestartMessage}}} {{t services.service.config.restartService.needToRestart}}  <a href="#" {{action showComponentsShouldBeRestarted target="view"}}>{{view.componentsCount}} {{pluralize view.componentsCount singular="t:common.component" plural="t:common.components"}}</a> {{t on}} <a href="#" {{action showHostsShouldBeRestarted target="view"}}>{{view.hostsCount}} {{pluralize view.hostsCount singular="t:common.host" plural="t:common.hosts"}}</a>
-          <span class="restart-components pull-right">&nbsp</span>
-          <div class="btn-group pull-right">
-            <button type="button" class="btn btn-default dropdown-toggle btn-warning" data-toggle="dropdown">
-              {{t hosts.host.details.needToRestart.button}}
-                <span class="caret"></span>
-            </button>
-            <ul class="dropdown-menu">
-                <li><a href="#" {{action restartAllStaleConfigComponents target="view"}}>{{t restart.service.all}}</a></li>
-              {{#if view.rollingRestartSlaveComponentName}}
-                  <li><a href="#" {{action rollingRestartStaleConfigSlaveComponents view.rollingRestartSlaveComponentName target="view"}}>{{view.rollingRestartActionName}}</a></li>
-              {{/if}}
-            </ul>
-          </div>
+{{#if view.service.isRestartRequired}}
+  {{#if App.isAdmin}}
+    <div id="summary-restart-bar">
+      <div class="alert alert-warning clearfix">
+        <i class="icon-refresh"></i> {{{view.needToRestartMessage}}} {{t services.service.config.restartService.needToRestart}}
+        <a href="#" {{action showComponentsShouldBeRestarted target="view"}}>{{view.componentsCount}} {{pluralize view.componentsCount singular="t:common.component" plural="t:common.components"}}</a> {{t on}}
+        <a href="#" {{action showHostsShouldBeRestarted target="view"}}>{{view.hostsCount}} {{pluralize view.hostsCount singular="t:common.host" plural="t:common.hosts"}}</a>
+        <span class="restart-components pull-right">&nbsp</span>
+
+        <div class="btn-group pull-right">
+          <button type="button" class="btn btn-default dropdown-toggle btn-warning" data-toggle="dropdown">
+            {{t hosts.host.details.needToRestart.button}}
+            <span class="caret"></span>
+          </button>
+          <ul class="dropdown-menu">
+            <li><a href="#" {{action restartAllStaleConfigComponents target="view"}}>{{t restart.service.all}}</a></li>
+            {{#if view.rollingRestartSlaveComponentName}}
+              <li>
+                <a href="#" {{action rollingRestartStaleConfigSlaveComponents view.rollingRestartSlaveComponentName target="view"}}>{{view.rollingRestartActionName}}</a>
+              </li>
+            {{/if}}
+          </ul>
         </div>
       </div>
-    {{/if}}
+    </div>
   {{/if}}
 {{/if}}
 
@@ -50,9 +53,9 @@
       <div class="service-content">
         <table id="summary-info" class="table no-borders table-condensed">
           <tbody>
-            {{#if view.serviceSummaryView}}
-              {{view view.serviceSummaryView}}
-            {{/if}}
+          {{#if view.serviceSummaryView}}
+            {{view view.serviceSummaryView}}
+          {{/if}}
           </tbody>
         </table>
       </div>
@@ -66,7 +69,8 @@
           {{#if controller.isNagiosInstalled}}
             <div class="btn-group">
               {{#if App.router.clusterController.isNagiosUrlLoaded}}
-                <a class="btn" target="_blank" rel="tooltip" title="Go to Nagios" {{bindAttr href="controller.nagiosUrl"}}><i class="icon-link"></i></a>
+                <a class="btn" target="_blank" rel="tooltip"
+                   title="Go to Nagios" {{bindAttr href="controller.nagiosUrl"}}><i class="icon-link"></i></a>
               {{else}}
                 <div class="spinner"></div>
               {{/if}}
@@ -106,13 +110,15 @@
         <div {{bindAttr class=":accordion collapsedSection.toggleIndex"}}>
           <div class="accordion-group box">
             <div class="accordion-heading box-header">
-              <span class="pull-left accordion-toggle" data-toggle="collapse" {{bindAttr dataParent="collapsedSection.toggleIndex" href="collapsedSection.toggleIndex"}}>
+              <span class="pull-left accordion-toggle"
+                    data-toggle="collapse" {{bindAttr dataParent="collapsedSection.toggleIndex" href="collapsedSection.toggleIndex"}}>
                 <i class="pull-left icon-caret-toggle"></i>
                 <span>{{collapsedSection.header}}</span>
               </span>
               <a class="btn pull-right" {{bindAttr href="collapsedSection.url"}} target="_blank">
                 <i class="icon-link"></i>
               </a>
+
               <div class="clearfix"></div>
             </div>
             <div class="accordion-body collapse in" {{bindAttr id="collapsedSection.id"}}>
@@ -130,38 +136,41 @@
 {{/if}}
 
 {{#if view.serviceMetricGraphs.length}}
-<div class="row-fluid">
-  <div class="span12">
-    <div class="box">
-      <div class="box-header">
-      <h4>{{controller.content.displayName}} {{t services.service.metrics}}</h4>
-        {{#if controller.isGangliaInstalled}}
-          <div class="btn-group">
-            {{#if App.router.clusterController.isGangliaUrlLoaded}}
-              <a class="btn" target="_blank" rel="tooltip" title="Go to Ganglia" {{bindAttr href="view.gangliaUrl"}}><i class="icon-link"></i></a>
-            {{else}}
-              <div class="spinner"></div>
-            {{/if}}
-          </div>
-        {{/if}}
-      </div>
+  <div class="row-fluid">
+    <div class="span12">
+      <div class="box">
+        <div class="box-header">
+          <h4>{{controller.content.displayName}} {{t services.service.metrics}}</h4>
+          {{#if controller.isGangliaInstalled}}
+            <div class="btn-group">
+              {{#if App.router.clusterController.isGangliaUrlLoaded}}
+                <a class="btn" target="_blank" rel="tooltip"
+                   title="Go to Ganglia" {{bindAttr href="view.gangliaUrl"}}><i class="icon-link"></i></a>
+              {{else}}
+                <div class="spinner"></div>
+              {{/if}}
+            </div>
+          {{/if}}
+        </div>
+
+        <div class="">
+          <table class="graphs">
+            {{#each graphs in view.serviceMetricGraphs}}
+              <tr>
+                {{#each graph in graphs}}
+                  <td>
+                    <div class="">
+                      {{view graph}}
+                    </div>
+                  </td>
+                {{/each}}
+              </tr>
+            {{/each}}
+          </table>
+        </div>
 
-      <div class="">
-        <table class="graphs">
-          {{#each graphs in view.serviceMetricGraphs}}
-            <tr>
-              {{#each graph in graphs}}
-                <td>
-                  <div class="">
-                    {{view graph}}
-                  </div>
-                </td>
-              {{/each}}
-            </tr>
-          {{/each}}
-        </table>
       </div>
-      
+
     </div>
   </div>
 </div>

+ 80 - 81
ambari-web/app/templates/wizard/step1.hbs

@@ -26,95 +26,94 @@
   {{/each}}
 </form>
 
-{{#if App.supports.localRepositories}}
-  <div class="accordion" id="advancedRepoAccordion">
-    <div class="accordion-group">
-      <div class="accordion-heading" {{action "onToggleBlock" target="view"}}>
-        <i {{bindAttr class=":pull-left :accordion-toggle view.isRLCollapsed:icon-caret-right:icon-caret-down"}}></i>
-        <a class="accordion-toggle">
-          {{t installer.step1.advancedRepo.title}}
-          {{#if view.isSubmitDisabled}}
-            <span class="badge badge-important">{{view.totalErrorCnt}}</span>
-          {{/if}}
-        </a>
 
-      </div>
-      <div class="accordion-body collapse in">
-        <div class="accordion-inner">
-          <div class="alert alert-info">{{t installer.step1.advancedRepo.message}}</div>
-          <div class="alert alert-warning">{{t installer.step1.advancedRepo.importantMassage}}</div>
+<div class="accordion" id="advancedRepoAccordion">
+  <div class="accordion-group">
+    <div class="accordion-heading" {{action "onToggleBlock" target="view"}}>
+      <i {{bindAttr class=":pull-left :accordion-toggle view.isRLCollapsed:icon-caret-right:icon-caret-down"}}></i>
+      <a class="accordion-toggle">
+        {{t installer.step1.advancedRepo.title}}
+        {{#if view.isSubmitDisabled}}
+          <span class="badge badge-important">{{view.totalErrorCnt}}</span>
+        {{/if}}
+      </a>
 
-          <div class="repositories-table">
-            <div class="thead">
-              <div class="first-th">&nbsp;</div>
-              <div class="th os-th">{{t common.os}}</div>
-              <div class="th name-th">{{t common.name}}</div>
-              <div class="th url-th">{{t installer.step1.advancedRepo.localRepo.column.baseUrl}}</div>
-            </div>
-            <div class="tbody">
-              {{#each operatingSystem in view.operatingSystems}}
-                <div class="trow">
-                  <div class="os-td">
-                    <label>
-                      {{view Ember.Checkbox checkedBinding="operatingSystem.isSelected"}}
-                      <span {{bindAttr class=":os operatingSystem.isSelected::disabled-label"}}>{{operatingSystem.osType}}</span>
-                    </label>
-                  </div>
-                  <div style="width:83%">
-                    {{#each repository in operatingSystem.repositories}}
-                        <div class="sub-trow">
-                          <div class="name-td">{{repository.repoId}}</div>
-                          <div class="validation-td">
-                            {{#if repository.validation}}
-                              {{view view.popoverView repositoryBinding="repository"}}
-                            {{/if}}
-                          </div>
-                          <div {{bindAttr class=":url-td operatingSystem.isSelected::disabled-textfield repository.emptyError:textfield-error repository.invalidError:textfield-error"}}>
-                            {{view Ember.TextField valueBinding="repository.baseUrl"}}
-                          </div>
-                          <div class="clear-td">
-                            {{#if repository.clearAll}}
-                              <a {{action "clearGroupLocalRepository" repository target="view" }}>
-                                <i class="icon-remove-sign"></i>
-                              </a>
-                            {{/if}}
-                          </div>
-                          <div class="actions-td">
-                            {{#if repository.undo}}
-                              <a {{action "undoGroupLocalRepository" repository target="view" }}>
-                                <i class="icon-undo"></i>{{t common.undo}}
-                              </a>
-                            {{/if}}
-                          </div>
-                         </div>
-                    {{/each}}
-                  </div>
-                </div>
-              {{/each}}
-            </div>
+    </div>
+    <div class="accordion-body collapse in">
+      <div class="accordion-inner">
+        <div class="alert alert-info">{{t installer.step1.advancedRepo.message}}</div>
+        <div class="alert alert-warning">{{t installer.step1.advancedRepo.importantMassage}}</div>
+
+        <div class="repositories-table">
+          <div class="thead">
+            <div class="first-th">&nbsp;</div>
+            <div class="th os-th">{{t common.os}}</div>
+            <div class="th name-th">{{t common.name}}</div>
+            <div class="th url-th">{{t installer.step1.advancedRepo.localRepo.column.baseUrl}}</div>
           </div>
-          <div id="skip-validation">
-            <label>{{view Ember.Checkbox checkedBinding="skipValidationChecked" class="checkbox"}}{{t installer.step1.advancedRepo.skipValidation.message}}
-              <i class="icon-question-sign" rel="skip-validation-tooltip"
-                 data-toggle="tooltip" {{translateAttr title="installer.step1.advancedRepo.skipValidation.tooltip"}}></i></label>
+          <div class="tbody">
+            {{#each operatingSystem in view.operatingSystems}}
+              <div class="trow">
+                <div class="os-td">
+                  <label>
+                    {{view Ember.Checkbox checkedBinding="operatingSystem.isSelected"}}
+                    <span {{bindAttr class=":os operatingSystem.isSelected::disabled-label"}}>{{operatingSystem.osType}}</span>
+                  </label>
+                </div>
+                <div style="width:83%">
+                  {{#each repository in operatingSystem.repositories}}
+                    <div class="sub-trow">
+                      <div class="name-td">{{repository.repoId}}</div>
+                      <div class="validation-td">
+                        {{#if repository.validation}}
+                          {{view view.popoverView repositoryBinding="repository"}}
+                        {{/if}}
+                      </div>
+                      <div {{bindAttr class=":url-td operatingSystem.isSelected::disabled-textfield repository.emptyError:textfield-error repository.invalidError:textfield-error"}}>
+                        {{view Ember.TextField valueBinding="repository.baseUrl"}}
+                      </div>
+                      <div class="clear-td">
+                        {{#if repository.clearAll}}
+                          <a {{action "clearGroupLocalRepository" repository target="view" }}>
+                            <i class="icon-remove-sign"></i>
+                          </a>
+                        {{/if}}
+                      </div>
+                      <div class="actions-td">
+                        {{#if repository.undo}}
+                          <a {{action "undoGroupLocalRepository" repository target="view" }}>
+                            <i class="icon-undo"></i>{{t common.undo}}
+                          </a>
+                        {{/if}}
+                      </div>
+                    </div>
+                  {{/each}}
+                </div>
+              </div>
+            {{/each}}
           </div>
-          {{#if view.emptyRepoExist}}
-            <div class="alert">{{t installer.step1.attentionNeeded}}</div>
-          {{/if}}
-          {{#if view.invalidUrlExist}}
-            <div class="alert">
-              {{t installer.step1.invalidURLAttention}}
-              <a href="javascript:void(null)" {{action "retryRepoUrls" target="view"}}>{{t installer.step1.retryRepoUrls}}</a>
-            </div>
-          {{/if}}
-          {{#if view.allRepoUnchecked}}
-            <div class="alert">{{t installer.step1.checkAtLeastOneAttention}}</div>
-          {{/if}}
         </div>
+        <div id="skip-validation">
+          <label>{{view Ember.Checkbox checkedBinding="skipValidationChecked" class="checkbox"}}{{t installer.step1.advancedRepo.skipValidation.message}}
+            <i class="icon-question-sign" rel="skip-validation-tooltip"
+               data-toggle="tooltip" {{translateAttr title="installer.step1.advancedRepo.skipValidation.tooltip"}}></i></label>
+        </div>
+        {{#if view.emptyRepoExist}}
+          <div class="alert">{{t installer.step1.attentionNeeded}}</div>
+        {{/if}}
+        {{#if view.invalidUrlExist}}
+          <div class="alert">
+            {{t installer.step1.invalidURLAttention}}
+            <a href="javascript:void(null)" {{action "retryRepoUrls" target="view"}}>{{t installer.step1.retryRepoUrls}}</a>
+          </div>
+        {{/if}}
+        {{#if view.allRepoUnchecked}}
+          <div class="alert">{{t installer.step1.checkAtLeastOneAttention}}</div>
+        {{/if}}
       </div>
     </div>
   </div>
-{{/if}}
+</div>
 
 <a class="btn pull-left" {{action back}}>&larr; {{t common.back}}</a>
 <button class="btn btn-success pull-right" {{bindAttr disabled="view.isSubmitDisabled"}} {{action next}}>{{t common.next}} &rarr;</button>

+ 0 - 16
ambari-web/app/templates/wizard/step2.hbs

@@ -99,22 +99,6 @@
     </div>
   </div>
 
-  <div class="advancedOptions">
-    {{#unless App.supports.localRepositories}}
-      <h5>{{t installer.step2.advancedOptions.header}}</h5>
-      <label {{bindAttr class=":checkbox"}}>
-        {{view Ember.Checkbox checkedBinding="content.installOptions.localRepo"}}
-
-        {{t installer.step2.localRepo.label_use}}
-
-        <a href="javascript:void(null)"
-           rel="popover"
-          {{translateAttr title="installer.step2.localRepo.tooltip.title" data-content="installer.step2.localRepo.tooltip.content"}}>
-          {{t installer.step2.localRepo.tooltip.title}}</a>
-        {{t installer.step2.localRepo.label_instead}}
-      </label>
-    {{/unless}}
-  </div>
   <div class="btn-area">
     {{#unless view.parentView.controller.hideBackButton}}
       <a class="btn pull-left" {{action back}}>&larr; {{t common.back}}</a>

+ 18 - 75
ambari-web/app/utils/config.js

@@ -164,12 +164,6 @@ App.config = Em.Object.create({
   //configs with these filenames go to appropriate category not in Advanced
   customFileNames: function () {
     var customFiles = ['flume-conf.xml'];
-    if (App.get('supports.capacitySchedulerUi')) {
-      if (App.get('isHadoop2Stack')) {
-        return customFiles.concat(['capacity-scheduler.xml']);
-      }
-      return customFiles.concat(['capacity-scheduler.xml', 'mapred-queue-acls.xml']);
-    }
     return customFiles;
   }.property('App.isHadoop2Stack'),
 
@@ -628,12 +622,6 @@ App.config = Em.Object.create({
     var stored = configs.filter(function (_config) {
       return this.get('categoriesWithCustom').contains(_config.category);
     }, this);
-    if (App.get('supports.capacitySchedulerUi')) {
-      var queueProperties = stored.filter(this.get('capacitySchedulerFilter'));
-      if (queueProperties.length) {
-        queueProperties.setEach('isQueue', true);
-      }
-    }
   },
 
   miscConfigVisibleProperty: function (configs, serviceToShow) {
@@ -697,55 +685,23 @@ App.config = Em.Object.create({
 
       // Use calculated default values for some configs
       var recommendedDefaults = {};
-      if (App.get('supports.serverRecommendValidate')) {
-        if (!storedConfigs && service.get('configTypes')) {
-          Object.keys(service.get('configTypes')).forEach(function (type) {
-            if (!recommended || !recommended[type]) {
-              return;
-            }
-            var defaults = recommended[type].properties;
-            for (var name in defaults) {
-              var config = configsByService.findProperty('name', name);
-              if (!config) {
-                continue;
-              }
-              recommendedDefaults[name] = defaults[name];
-              config.set('value', defaults[name]);
-              config.set('defaultValue', defaults[name]);
-            }
-          });
-        }
-      } else {
-        if (!storedConfigs && service.get('defaultsProviders')) {
-          service.get('defaultsProviders').forEach(function (defaultsProvider) {
-            var defaults = defaultsProvider.getDefaults(localDB);
-            for (var name in defaults) {
-              var config = configsByService.findProperty('name', name);
-              if (!config) {
-                continue;
-              }
-              if (!!defaults[name]) {
-                recommendedDefaults[name] = defaults[name];
-                config.set('value', defaults[name]);
-                config.set('defaultValue', defaults[name]);
-              } else {
-                recommendedDefaults[name] = config.get('defaultValue');
-              }
-            }
-          });
-        }
-        if (service.get('configsValidator')) {
-          service.get('configsValidator').set('recommendedDefaults', recommendedDefaults);
-          var validators = service.get('configsValidator').get('configValidators');
-          for (var validatorName in validators) {
-            var c = configsByService.findProperty('name', validatorName);
-            if (c) {
-              c.set('serviceValidator', service.get('configsValidator'));
+      if (!storedConfigs && service.get('configTypes')) {
+        Object.keys(service.get('configTypes')).forEach(function (type) {
+          if (!recommended || !recommended[type]) {
+            return;
+          }
+          var defaults = recommended[type].properties;
+          for (var name in defaults) {
+            var config = configsByService.findProperty('name', name);
+            if (!config) {
+              continue;
             }
+            recommendedDefaults[name] = defaults[name];
+            config.set('value', defaults[name]);
+            config.set('defaultValue', defaults[name]);
           }
-        }
+        });
       }
-
       serviceConfig.set('configs', configsByService);
       renderedServiceConfigs.push(serviceConfig);
     }, this);
@@ -808,17 +764,6 @@ App.config = Em.Object.create({
       configs: [],
       configGroups: []
     });
-    serviceConfig.configCategories.filterProperty('isCustomView', true).forEach(function (category) {
-      switch (category.name) {
-        case 'CapacityScheduler':
-          if (App.get('supports.capacitySchedulerUi')) {
-            category.set('customView', App.ServiceConfigCapacityScheduler);
-          } else {
-            category.set('isCustomView', false);
-          }
-          break;
-      }
-    }, this);
     return serviceConfig;
   },
   /**
@@ -922,12 +867,12 @@ App.config = Em.Object.create({
         var fileName = item.type;
         var isHDP2 = App.get('isHadoop2Stack');
         /**
-         * Properties from mapred-queue-acls.xml are ignored unless App.supports.capacitySchedulerUi is true
+         * Properties from mapred-queue-acls.xml are ignored
          * Properties from capacity-scheduler.xml are ignored unless HDP stack version is 2.x or
-         * HDP stack version is 1.x and App.supports.capacitySchedulerUi is true.
+         * HDP stack version is 1.x
          */
-        if ((fileName !== 'mapred-queue-acls.xml' || App.get('supports.capacitySchedulerUi')) &&
-          (fileName !== 'capacity-scheduler.xml' || isHDP2 || App.get('supports.capacitySchedulerUi'))) {
+        if (fileName !== 'mapred-queue-acls.xml' &&
+          (fileName !== 'capacity-scheduler.xml' || isHDP2)) {
           var property = {
             serviceName: serviceName,
             name: item.property_name,
@@ -1363,12 +1308,10 @@ App.config = Em.Object.create({
   persistWizardStep7ConfigGroups: function () {
     var installerController = App.router.get('installerController');
     var step7Controller = App.router.get('wizardStep7Controller');
-    if (App.get('supports.hostOverridesInstaller')) {
       installerController.saveServiceConfigGroups(step7Controller, step7Controller.get('content.controllerName') == 'addServiceController');
       App.clusterStatus.setClusterStatus({
         localdb: App.db.data
       });
-    }
   },
   /**
    * exclude configs that depends on services which are uninstalled

+ 12 - 18
ambari-web/app/utils/host_progress_popup.js

@@ -357,9 +357,7 @@ App.HostPopup = Em.Object.create({
           updatedService = this.createService(service);
           servicesInfo.insertAt(index, updatedService);
         }
-        if (App.get('supports.abortRequests')) {
-          updatedService.set('isAbortable', this.isAbortableByStatus(service.status));
-        }
+        updatedService.set('isAbortable', this.isAbortableByStatus(service.status));
       }, this);
       this.removeOldServices(servicesInfo, currentServices);
       this.setBackgroundOperationHeader(isServiceListHidden);
@@ -600,13 +598,12 @@ App.HostPopup = Em.Object.create({
         self.set('previousServiceId', this.get('currentServiceId'));
       }
     }
-    if (App.get('supports.abortRequests')) {
-      var operation = this.get('servicesInfo').findProperty('name', this.get('serviceName'));
-      if (!operation || (operation && operation.get('progress') == 100)) {
-        this.set('operationInfo', null);
-      } else {
-        this.set('operationInfo', operation);
-      }
+
+    var operation = this.get('servicesInfo').findProperty('name', this.get('serviceName'));
+    if (!operation || (operation && operation.get('progress') == 100)) {
+      this.set('operationInfo', null);
+    } else {
+      this.set('operationInfo', operation);
     }
   },
 
@@ -657,9 +654,9 @@ App.HostPopup = Em.Object.create({
       headerClass: Em.View.extend({
         controller: this,
         template: Ember.Handlebars.compile('{{popupHeaderName}} ' +
-            '{{#if App.supports.abortRequests}}{{#unless view.parentView.isHostListHidden}}{{#if controller.operationInfo.isAbortable}}' +
+            '{{#unless view.parentView.isHostListHidden}}{{#if controller.operationInfo.isAbortable}}' +
             '{{view controller.abortIcon servicesInfoBinding="controller.operationInfo"}}' +
-            '{{/if}}{{/unless}}{{/if}}')
+            '{{/if}}{{/unless}}')
       }),
 
       /**
@@ -957,9 +954,7 @@ App.HostPopup = Em.Object.create({
           this.set("parentView.isHostListHidden", false);
           this.set("parentView.isTaskListHidden", true);
           this.get("controller").set("popupHeaderName", this.get("controller.serviceName"));
-          if (App.get('supports.abortRequests')) {
-            this.get("controller").set("operationInfo", this.get('controller.servicesInfo').findProperty('name', this.get('controller.serviceName')));
-          }
+          this.get("controller").set("operationInfo", this.get('controller.servicesInfo').findProperty('name', this.get('controller.serviceName')));
           this.switchLevel("HOSTS_LIST");
         },
 
@@ -1006,9 +1001,8 @@ App.HostPopup = Em.Object.create({
           this.switchLevel("HOSTS_LIST");
           var servicesInfo = this.get("controller.hosts");
           this.set("controller.popupHeaderName", event.context.get("name"));
-          if (App.get('supports.abortRequests')) {
-            this.set("controller.operationInfo", event.context);
-          }
+          this.set("controller.operationInfo", event.context);
+
           //apply lazy loading on cluster with more than 100 nodes
           if (servicesInfo.length > 100) {
             this.set('hosts', servicesInfo.slice(0, 50));

+ 0 - 5
ambari-web/app/views.js

@@ -246,11 +246,6 @@ require('views/main/apps_view');
 require('views/main/apps/item_view');
 require('views/main/apps/item/bar_view');
 require('views/main/apps/item/dag_view');
-require('views/main/mirroring_view');
-require('views/main/mirroring/edit_dataset_view');
-require('views/main/mirroring/datasets_view');
-require('views/main/mirroring/jobs_view');
-require('views/main/mirroring/manage_clusters_view');
 
 require('views/main/views_view');
 

+ 3 - 709
ambari-web/app/views/common/configs/services_config.js

@@ -40,11 +40,10 @@ App.ServiceConfigView = Em.View.extend({
   supportsHostOverrides: function () {
     switch (this.get('controller.name')) {
       case 'wizardStep7Controller':
-        return App.supports.hostOverridesInstaller && (this.get('controller.selectedService.serviceName') !== 'MISC');
+        return this.get('controller.selectedService.serviceName') !== 'MISC';
       case 'mainServiceInfoConfigsController':
-        return App.supports.hostOverrides;
       case 'mainHostServiceConfigsController':
-        return App.supports.hostOverridesHost;
+        return true;
       default:
         return false;
     }
@@ -845,709 +844,4 @@ App.ServiceConfigTab = Ember.View.extend({
     var serviceName = this.get('controller.selectedService.serviceName');
     this.$('a[href="#' + serviceName + '"]').tab('show');
   }
-});
-
-/**
- * custom view for capacity scheduler category
- * @type {*}
- */
-App.ServiceConfigCapacityScheduler = App.ServiceConfigsByCategoryView.extend({
-  templateName: require('templates/common/configs/capacity_scheduler'),
-  category: null,
-  service: null,
-  serviceConfigs: null,
-  customConfigs: function(){
-    return App.config.get('preDefinedCustomConfigs');
-  }.property('App.config.preDefinedCustomConfigs'),
-  /**
-   * configs filtered by capacity-scheduler category
-   */
-  categoryConfigs: function () {
-    return this.get('serviceConfigs').filterProperty('category', this.get('category.name'));
-  }.property('queueObserver', 'serviceConfigs.@each'),
-  /**
-   * rewrote method to avoid incompatibility with parent
-   */
-  filteredCategoryConfigs: function () {
-    return this.get('categoryConfigs');
-  }.property(),
-  advancedConfigs: function () {
-    return this.get('categoryConfigs').filterProperty('isQueue', undefined) || [];
-  }.property('categoryConfigs.@each'),
-  didInsertElement: function () {
-    this._super();
-    this.createEmptyQueue(this.get('customConfigs').filterProperty('isQueue'));
-  },
-  //list of fields which will be populated by default in a new queue
-  fieldsToPopulate: function(){
-    if(App.get('isHadoop2Stack')){
-      return ["yarn.scheduler.capacity.root.<queue-name>.user-limit-factor",
-      "yarn.scheduler.capacity.root.<queue-name>.state"];
-    }
-    return [
-      "mapred.capacity-scheduler.queue.<queue-name>.minimum-user-limit-percent",
-      "mapred.capacity-scheduler.queue.<queue-name>.user-limit-factor",
-      "mapred.capacity-scheduler.queue.<queue-name>.supports-priority",
-      "mapred.capacity-scheduler.queue.<queue-name>.maximum-initialized-active-tasks",
-      "mapred.capacity-scheduler.queue.<queue-name>.maximum-initialized-active-tasks-per-user",
-      "mapred.capacity-scheduler.queue.<queue-name>.init-accept-jobs-factor"
-    ];
-  }.property('App.isHadoop2Stack'),
-  /**
-   * create empty queue
-   * take some queue then copy it and set all config values to null
-   * @param customConfigs
-   */
-  createEmptyQueue: function (customConfigs) {
-    var emptyQueue = {
-      name: '<queue-name>',
-      configs: []
-    };
-    var fieldsToPopulate = this.get('fieldsToPopulate');
-    customConfigs.forEach(function (config) {
-      var newConfig = $.extend({}, config);
-      if (fieldsToPopulate.contains(config.name)) {
-        newConfig.value = config.defaultValue;
-      }
-      newConfig = App.ServiceConfigProperty.create(newConfig);
-      newConfig.validate();
-      emptyQueue.configs.push(newConfig);
-    });
-    this.set('emptyQueue', emptyQueue);
-  },
-  deriveQueueNames: function(configs){
-    var queueNames = [];
-    configs.mapProperty('name').forEach(function(name){
-      var queueName;
-      if(App.get('isHadoop2Stack')){
-        queueName = /^yarn\.scheduler\.capacity\.root\.(.*?)\./.exec(name);
-      } else {
-        queueName = /^mapred\.capacity-scheduler\.queue\.(.*?)\./.exec(name);
-      }
-      if(queueName){
-        queueNames.push(queueName[1]);
-      }
-    });
-    return queueNames.uniq();
-  },
-  queues: function(){
-    var configs = this.get('categoryConfigs').filterProperty('isQueue', true);
-    var queueNames = this.deriveQueueNames(configs);
-    var queues = [];
-
-    queueNames.forEach(function(queueName){
-      queues.push({
-        name: queueName,
-        color: this.generateColor(queueName),
-        configs: this.groupConfigsByQueue(queueName, configs)
-      })
-    }, this);
-    return queues;
-  }.property('queueObserver'),
-  /**
-   * group configs by queue
-   * @param queueName
-   * @param configs
-   */
-  groupConfigsByQueue: function (queueName, configs) {
-    var customConfigs = [];
-    var queue = [];
-    this.get('customConfigs').forEach(function(_config){
-      var copy = $.extend({}, _config);
-      copy.name = _config.name.replace('<queue-name>', queueName);
-      customConfigs.push(copy);
-    });
-    configs.forEach(function (config) {
-      var customConfig = customConfigs.findProperty('name', config.get('name'));
-      if (customConfig) {
-        config.set('description', customConfig.description);
-        config.set('displayName', customConfig.displayName);
-        config.set('isRequired', customConfig.isRequired);
-        config.set('unit', customConfig.unit);
-        config.set('displayType', customConfig.displayType);
-        config.set('valueRange', customConfig.valueRange);
-        config.set('isVisible', customConfig.isVisible);
-        config.set('inTable', customConfig.inTable);
-        config.set('index', customConfig.index);
-        queue.push(config);
-      }
-    });
-    if(queue.length < customConfigs.length){
-      this.addMissingProperties(queue, customConfigs);
-    }
-    return queue;
-  },
-  /**
-   * add missing properties to queue when they don't come from server
-   * @param queue
-   * @param customConfigs
-   */
-  addMissingProperties: function(queue, customConfigs){
-    customConfigs.forEach(function(_config){
-      var serviceConfigProperty;
-      if(!queue.someProperty('name', _config.name)){
-        _config.value = _config.defaultValue;
-        serviceConfigProperty = App.ServiceConfigProperty.create(_config);
-        serviceConfigProperty.validate();
-        queue.push(serviceConfigProperty);
-      }
-    }, this);
-  },
-  /**
-   * convert queues to table content
-   */
-  tableContent: function () {
-    var result = [];
-    this.get('queues').forEach(function (queue) {
-      var usersAndGroups = queue.configs.findProperty('name', this.getUserAndGroupNames(queue.name)[0]).get('value');
-      usersAndGroups = (usersAndGroups) ? usersAndGroups.split(' ') : [''];
-      if (usersAndGroups.length == 1) {
-        usersAndGroups.push('');
-      }
-      var queueObject = {
-        name: queue.name,
-        color: 'background-color:' + queue.color + ';',
-        configs: this.sortByIndex(queue.configs.filterProperty('inTable'))
-      };
-      //push acl_submit_jobs users
-      queueObject.configs.unshift({
-        value: usersAndGroups[1],
-        inTable: true,
-        displayName: Em.I18n.t('common.users')
-      });
-      //push acl_submit_jobs groups
-      queueObject.configs.unshift({
-        value: usersAndGroups[0],
-        inTable: true,
-        displayName: Em.I18n.t('services.mapReduce.config.queue.groups')
-      });
-      result.push(queueObject);
-    }, this);
-    return result;
-  }.property('queues'),
-  /**
-   * create headers depending on existed properties in queue
-   */
-  tableHeaders: function(){
-    var headers = [
-      Em.I18n.t('services.mapReduce.config.queue.name')
-    ];
-    return (this.get('tableContent').length) ?
-      headers.concat(this.get('tableContent').objectAt(0).configs.filterProperty('inTable').mapProperty('displayName')):
-      headers;
-  }.property('tableContent'),
-  queueObserver: null,
-  /**
-   * uses as template for adding new queue
-   */
-  emptyQueue: {},
-  /**
-   * get capacities sum of queues except of current
-   * @param queueName
-   * @return {Number}
-   */
-  getQueuesCapacitySum: function(queueName){
-    var capacitySum = 0;
-    this.get('queues').filter(function(queue){
-      return queue.name !== queueName;
-    }).forEach(function(queue){
-        capacitySum = capacitySum + window.parseInt(queue.configs.find(function(config){
-          return config.get('name').substr(-9, 9) === '.capacity';
-        }).get('value'));
-      });
-    return capacitySum;
-  },
-  /**
-   * get names of configs, for users and groups, which have different names in HDP1 and HDP2
-   * @param queueName
-   * @return {Array}
-   */
-  getUserAndGroupNames: function(queueName){
-    queueName = queueName || '<queue-name>';
-    if(App.get('isHadoop2Stack') && this.get('controller.selectedService')) {
-      if (this.get('controller.selectedService.serviceName') == "YARN") {
-        return ['yarn.scheduler.capacity.root.' + queueName + '.acl_submit_jobs',
-          'yarn.scheduler.capacity.root.' + queueName + '.acl_administer_jobs']
-      }
-      return ['mapred.queue.' + queueName + '.acl-submit-job',
-        'mapred.queue.' + queueName + '.acl-administer-jobs']
-    }
-  },
-  generateColor: function (str) {
-    var hash = 0;
-    for (var i = 0; i < str.length; i++) {
-      hash = str.charCodeAt(i) + ((hash << 5) - hash);
-    }
-    return '#' + Number(Math.abs(hash)).toString(16).concat('00000').substr(0, 6);
-  },
-  /**
-   * add new queue
-   * add created configs to serviceConfigs with current queue name
-   * @param queue
-   */
-  addQueue: function (queue) {
-    var serviceConfigs = this.get('serviceConfigs');
-    var admin = [];
-    var submit = [];
-    var submitConfig;
-    var adminConfig;
-    queue.name = queue.configs.findProperty('name', 'queueName').get('value');
-    queue.configs.forEach(function (config) {
-      var adminName = this.getUserAndGroupNames()[1];
-      var submitName = this.getUserAndGroupNames()[0];
-      if(config.name == adminName){
-        if (config.type == 'USERS') {
-          admin[0] = config.value;
-        }
-        if (config.type == 'GROUPS') {
-          admin[1] = config.value;
-        }
-        if (config.isQueue) {
-          adminConfig = config;
-        }
-      }
-      if(config.name == submitName){
-        if (config.type == 'USERS') {
-          submit[0] = config.value;
-        }
-        if (config.type == 'GROUPS') {
-          submit[1] = config.value;
-        }
-        if (config.isQueue) {
-          submitConfig = config;
-        }
-      }
-      config.set('name', config.get('name').replace('<queue-name>', queue.name));
-      config.set('value', config.get('value').toString());
-      if (config.isQueue) {
-        serviceConfigs.push(config);
-      }
-    }, this);
-    adminConfig.set('value', admin.join(' '));
-    submitConfig.set('value', submit.join(' '));
-    this.set('queueObserver', App.dateTime());
-  },
-  /**
-   * delete queue
-   * delete configs from serviceConfigs which have current queue name
-   * @param queue
-   */
-  deleteQueue: function (queue) {
-    var serviceConfigs = this.get('serviceConfigs');
-    var configNames = queue.configs.filterProperty('isQueue').mapProperty('name');
-    for (var i = 0, l = serviceConfigs.length; i < l; i++) {
-      if (configNames.contains(serviceConfigs[i].name)) {
-        serviceConfigs.splice(i, 1);
-        l--;
-        i--;
-      }
-    }
-    this.set('queueObserver', App.dateTime());
-  },
-  /**
-   * save changes that was made to queue
-   * edit configs from serviceConfigs which have current queue name
-   * @param queue
-   */
-  editQueue: function (queue) {
-    var serviceConfigs = this.get('serviceConfigs');
-    var configNames = queue.configs.filterProperty('isQueue').mapProperty('name');
-    serviceConfigs.forEach(function (_config) {
-      var configName = _config.get('name');
-      var admin = [];
-      var submit = [];
-      //comparison executes including 'queue.<queue-name>' to avoid false matches
-      var queueNamePrefix = App.get('isHadoop2Stack') ? 'root.' : 'queue.';
-      if (configNames.contains(_config.get('name'))) {
-        if(configName == this.getUserAndGroupNames(queue.name)[0]){
-          submit = queue.configs.filterProperty('name', configName);
-          submit = submit.findProperty('type', 'USERS').get('value') + ' ' + submit.findProperty('type', 'GROUPS').get('value');
-          _config.set('value', submit);
-        } else if(configName == this.getUserAndGroupNames(queue.name)[1]){
-          admin = queue.configs.filterProperty('name', configName);
-          admin = admin.findProperty('type', 'USERS').get('value') + ' ' + admin.findProperty('type', 'GROUPS').get('value');
-          _config.set('value', admin);
-        } else {
-          _config.set('value', queue.configs.findProperty('name', _config.get('name')).get('value').toString());
-        }
-        _config.set('name', configName.replace(queueNamePrefix + queue.name, queueNamePrefix + queue.configs.findProperty('name', 'queueName').get('value')));
-      }
-    }, this);
-    this.set('queueObserver', App.dateTime());
-  },
-  pieChart: App.ChartPieView.extend({
-    w: 200,
-    h: 200,
-    queues: null,
-    didInsertElement: function () {
-      this.update();
-    },
-    data: [{"label":"default", "value":100}],
-    update: function () {
-      var self = this;
-      var data = [];
-      var queues = this.get('queues');
-      var capacitiesSum = 0;
-      queues.forEach(function (queue) {
-        var value = window.parseInt(queue.configs.find(function(_config){
-          return _config.get('name').substr(-9, 9) === '.capacity';
-        }).get('value'));
-        data.push({
-          label: queue.name,
-          value: value,
-          color: queue.color
-        })
-      });
-
-      data.mapProperty('value').forEach(function (capacity) {
-        capacitiesSum += capacity;
-      });
-      if (capacitiesSum < 100) {
-        data.push({
-          label: Em.I18n.t('common.empty'),
-          value: (100 - capacitiesSum),
-          color: 'transparent',
-          isEmpty: true
-        })
-      }
-      $(d3.select(this.get('selector'))[0]).children().remove();
-      this.set('data', data);
-      this.set('palette', new Rickshaw.Color.Palette({
-        scheme: data.mapProperty('color')
-      }));
-      this.appendSvg();
-
-      this.get('arcs')
-        .on("click",function (d, i) {
-          var event = {context: d.data.label};
-          if (d.data.isEmpty !== true) self.get('parentView').queuePopup(event);
-        }).on('mouseover', function (d, i) {
-          var position = d3.svg.mouse(this);
-          var label = $('#section_label');
-          label.css('left', position[0] + 100);
-          label.css('top', position[1] + 100);
-          label.text(d.data.label);
-          label.show();
-        })
-        .on('mouseout', function (d, i) {
-          $('#section_label').hide();
-        })
-
-    }.observes('queues'),
-    donut: d3.layout.pie().sort(null).value(function (d) {
-      return d.value;
-    })
-  }),
-  /**
-   * open popup with chosen queue
-   * @param event
-   */
-  queuePopup: function (event) {
-    //if queueName was handed that means "Edit" mode, otherwise "Add" mode
-    var queueName = event.context || null;
-    var self = this;
-    App.ModalPopup.show({
-      didInsertElement: function () {
-        if (queueName) {
-          this.set('header', Em.I18n.t('services.mapReduce.config.editQueue'));
-          this.set('secondary', Em.I18n.t('common.save'));
-          if (self.get('queues').length > 1 && self.get('canEdit')) {
-            this.set('delete', Em.I18n.t('common.delete'));
-          }
-        }
-      },
-      header: Em.I18n.t('services.mapReduce.config.addQueue'),
-      secondary: Em.I18n.t('common.add'),
-      primary: Em.I18n.t('common.cancel'),
-      delete: null,
-      isError: function () {
-        if (!self.get('canEdit')) {
-          return true;
-        }
-        var content = this.get('content');
-        var configs = content.configs.filter(function (config) {
-          return !(config.name == self.getUserAndGroupNames(content.name)[0] ||
-            config.name == self.getUserAndGroupNames(content.name)[1] &&
-              config.isQueue);
-        });
-        return configs.someProperty('isValid', false);
-      }.property('content.configs.@each.isValid'),
-      onDelete: function () {
-        var view = this;
-        App.ModalPopup.show({
-          header: Em.I18n.t('popup.confirmation.commonHeader'),
-          body: Em.I18n.t('hosts.delete.popup.body'),
-          primary: Em.I18n.t('yes'),
-          onPrimary: function () {
-            self.deleteQueue(view.get('content'));
-            view.hide();
-            this.hide();
-          }
-        });
-      },
-      onSecondary: function () {
-        if (queueName) {
-          self.editQueue(this.get('content'));
-        } else {
-          self.addQueue(this.get('content'));
-        }
-        this.hide();
-      },
-      /**
-       * Queue properties order:
-       * 1. Queue Name
-       * 2. Capacity
-       * 3. Max Capacity
-       * 4. Users
-       * 5. Groups
-       * 6. Admin Users
-       * 7. Admin Groups
-       * 8. Support Priority
-       * ...
-       */
-      content: function () {
-        var content = (queueName) ? self.get('queues').findProperty('name', queueName) : self.get('emptyQueue');
-        var configs = [];
-        // copy of queue configs
-        content.configs.forEach(function (config, index) {
-          if(config.get('name').substr(-9, 9) === '.capacity') {
-            //added validation function for capacity property
-            config.reopen({
-              validate: function () {
-                var value = this.get('value');
-                var isError = false;
-                var capacitySum = self.getQueuesCapacitySum(content.name);
-                if (value == '') {
-                  if (this.get('isRequired')) {
-                    this.set('errorMessage', 'This is required');
-                    isError = true;
-                  } else {
-                    return;
-                  }
-                }
-                if (!isError) {
-                  if (!validator.isValidInt(value)) {
-                    this.set('errorMessage', 'Must contain digits only');
-                    isError = true;
-                  }
-                }
-                if (!isError) {
-                  if ((capacitySum + parseInt(value)) > 100) {
-                    isError = true;
-                    this.set('errorMessage', 'The sum of capacities more than 100');
-                  }
-                  if (!isError) {
-                    this.set('errorMessage', '');
-                  }
-                }
-              }.observes('value')
-            });
-          }
-          if (config.name == 'mapred.capacity-scheduler.queue.' + content.name + '.supports-priority') {
-            if (config.get('value') == 'true' || config.get('value') === true) {
-              config.set('value', true);
-            } else {
-              config.set('value', false);
-            }
-          }
-          if(config.name === 'yarn.scheduler.capacity.root.' + content.name + '.state'){
-            config.reopen({
-              validate: function(){
-                var value = this.get('value');
-                this._super();
-                if(!this.get('errorMessage')){
-                  if(!(value === 'STOPPED' || value === 'RUNNING')){
-                    this.set('errorMessage', 'State value should be RUNNING or STOPPED');
-                  }
-                }
-              }.observes('value')
-            })
-          }
-          configs[index] = App.ServiceConfigProperty.create(config);
-        });
-        content = {
-          name: content.name,
-          configs: configs
-        };
-        content = this.insertExtraConfigs(content);
-        content.configs = self.sortByIndex(content.configs);
-        return content;
-      }.property(),
-      footerClass: Ember.View.extend({
-        classNames: ['modal-footer', 'host-checks-update'],
-        templateName: require('templates/common/configs/queuePopup_footer')
-      }),
-      bodyClass: Ember.View.extend({
-        templateName: require('templates/common/configs/queuePopup_body')
-      }),
-      /**
-       * Insert extra config in popup according to queue
-       *
-       * the mapred.queue.default.acl-administer-jobs turns into two implicit configs:
-       * "Admin Users" field and "Admin Groups" field
-       * the mapred.queue.default.acl-submit-job turns into two implicit configs:
-       * "Users" field and "Groups" field
-       * Add implicit config that contain "Queue Name"
-       * @param content
-       * @return {*}
-       */
-      insertExtraConfigs: function (content) {
-        var that = this;
-        var admin = content.configs.findProperty('name', self.getUserAndGroupNames(content.name)[1]).get('value');
-        var submit = content.configs.findProperty('name', self.getUserAndGroupNames(content.name)[0]).get('value');
-        admin = (admin) ? admin.split(' ') : [''];
-        submit = (submit) ? submit.split(' ') : [''];
-        if (admin.length < 2) {
-          admin.push('');
-        }
-        if (submit.length < 2) {
-          submit.push('');
-        }
-        var nameField = App.ServiceConfigProperty.create({
-          name: 'queueName',
-          displayName: Em.I18n.t('services.mapReduce.extraConfig.queue.name'),
-          description: Em.I18n.t('services.mapReduce.description.queue.name'),
-          value: (content.name == '<queue-name>') ? '' : content.name,
-          validate: function () {
-            var queueNames = self.get('queues').mapProperty('name');
-            var value = this.get('value');
-            var isError = false;
-            var regExp = /^[a-z]([\_\-a-z0-9]{0,50})\$?$/i;
-            if (value == '') {
-              if (this.get('isRequired')) {
-                this.set('errorMessage', 'This is required');
-                isError = true;
-              } else {
-                return;
-              }
-            }
-            if (!isError) {
-              if ((queueNames.indexOf(value) !== -1) && (value != content.name)) {
-                this.set('errorMessage', 'Queue name is already used');
-                isError = true;
-              }
-            }
-            if (!isError) {
-              if (!regExp.test(value)) {
-                this.set('errorMessage', 'Incorrect input');
-                isError = true;
-              }
-            }
-            if (!isError) {
-              this.set('errorMessage', '');
-            }
-          }.observes('value'),
-          isRequired: true,
-          isVisible: true,
-          isEditable: self.get('canEdit'),
-          index: 0
-        });
-        nameField.validate();
-        content.configs.unshift(nameField);
-
-        var submitUser = App.ServiceConfigProperty.create({
-          name: self.getUserAndGroupNames(content.name)[0],
-          displayName: Em.I18n.t('common.users'),
-          value: submit[0],
-          description: Em.I18n.t('services.mapReduce.description.queue.submit.user'),
-          isRequired: true,
-          isVisible: true,
-          type: 'USERS',
-          displayType: "UNIXList",
-          isEditable: self.get('canEdit'),
-          index: 3
-        });
-
-        var submitGroup = App.ServiceConfigProperty.create({
-          name: self.getUserAndGroupNames(content.name)[0],
-          displayName: Em.I18n.t('services.mapReduce.config.queue.groups'),
-          description: Em.I18n.t('services.mapReduce.description.queue.submit.group'),
-          value: submit[1],
-          isRequired: true,
-          isVisible: true,
-          "displayType": "UNIXList",
-          type: 'GROUPS',
-          isEditable: self.get('canEdit'),
-          index: 4
-        });
-
-        var adminUser = App.ServiceConfigProperty.create({
-          name: self.getUserAndGroupNames(content.name)[1],
-          displayName: Em.I18n.t('services.mapReduce.config.queue.adminUsers'),
-          description: Em.I18n.t('services.mapReduce.description.queue.admin.user'),
-          value: admin[0],
-          isRequired: true,
-          isVisible: true,
-          type: 'USERS',
-          displayType: "UNIXList",
-          isEditable: self.get('canEdit'),
-          index: 5
-        });
-
-        var adminGroup = App.ServiceConfigProperty.create({
-          name: self.getUserAndGroupNames(content.name)[1],
-          displayName: Em.I18n.t('services.mapReduce.config.queue.adminGroups'),
-          value: admin[1],
-          description: Em.I18n.t('services.mapReduce.description.queue.admin.group'),
-          isRequired: true,
-          isVisible: true,
-          "displayType": "UNIXList",
-          type: 'GROUPS',
-          isEditable: self.get('canEdit'),
-          index: 6
-        });
-
-        submitUser.reopen({
-          validate: function () {
-            that.userGroupValidation(this, submitGroup);
-          }.observes('value')
-        });
-        submitGroup.reopen({
-          validate: function () {
-            that.userGroupValidation(this, submitUser);
-          }.observes('value')
-        });
-        adminUser.reopen({
-          validate: function () {
-            that.userGroupValidation(this, adminGroup);
-          }.observes('value')
-        });
-        adminGroup.reopen({
-          validate: function () {
-            that.userGroupValidation(this, adminUser);
-          }.observes('value')
-        });
-
-        submitUser.validate();
-        adminUser.validate();
-        content.configs.push(submitUser);
-        content.configs.push(submitGroup);
-        content.configs.push(adminUser);
-        content.configs.push(adminGroup);
-
-        return content;
-      },
-      /**
-       * Validate by follow rules:
-       * Users can be blank. If it is blank, Groups must not be blank.
-       * Groups can be blank. If it is blank, Users must not be blank.
-       * @param context
-       * @param boundConfig
-       */
-      userGroupValidation: function (context, boundConfig) {
-        if (context.get('value') == '') {
-          if (boundConfig.get('value') == '') {
-            context._super();
-          } else {
-            boundConfig.validate();
-          }
-        } else {
-          if (boundConfig.get('value') == '') {
-            boundConfig.set('errorMessage', '');
-          }
-          context._super();
-        }
-      }
-    })
-  }
-});
+});

+ 9 - 12
ambari-web/app/views/common/quick_view_link_view.js

@@ -221,17 +221,15 @@ App.QuickViewLinks = Em.View.extend({
           return item.host_components.someProperty('HostRoles.component_name', 'HBASE_MASTER');
         });
         var activeMaster, standbyMasters, otherMasters;
-        if (App.supports.multipleHBaseMasters) {
-          activeMaster = masterComponents.filter(function (item) {
-            return item.host_components.someProperty('metrics.hbase.master.IsActiveMaster', 'true');
-          });
-          standbyMasters = masterComponents.filter(function (item) {
-            return item.host_components.someProperty('metrics.hbase.master.IsActiveMaster', 'false');
-          });
-          otherMasters = masterComponents.filter(function (item) {
-            return !(item.host_components.someProperty('metrics.hbase.master.IsActiveMaster', 'true') || item.host_components.someProperty('metrics.hbase.master.IsActiveMaster', 'false'));
-          });
-        }
+        activeMaster = masterComponents.filter(function (item) {
+          return item.host_components.someProperty('metrics.hbase.master.IsActiveMaster', 'true');
+        });
+        standbyMasters = masterComponents.filter(function (item) {
+          return item.host_components.someProperty('metrics.hbase.master.IsActiveMaster', 'false');
+        });
+        otherMasters = masterComponents.filter(function (item) {
+          return !(item.host_components.someProperty('metrics.hbase.master.IsActiveMaster', 'true') || item.host_components.someProperty('metrics.hbase.master.IsActiveMaster', 'false'));
+        });
         if (masterComponents.length > 1) {
           // need all hbase_masters hosts in quick links
           if (activeMaster) {
@@ -389,7 +387,6 @@ App.QuickViewLinks = Em.View.extend({
       case "oozie":
       case "ganglia":
       case "nagios":
-      case "hue":
       case "storm":
       case "falcon":
         return "_blank";

+ 5 - 7
ambari-web/app/views/main/admin.js

@@ -33,13 +33,11 @@ App.MainAdminView = Em.View.extend({
       url: 'adminServiceAccounts',
       label: Em.I18n.t('common.serviceAccounts')
     });
-    if (App.supports.secureCluster) {
-      items.push({
-        name: 'security',
-        url: 'adminSecurity.index',
-        label: Em.I18n.t('common.security')
-      });
-    }
+    items.push({
+      name: 'security',
+      url: 'adminSecurity.index',
+      label: Em.I18n.t('common.security')
+    });
     return items;
   }.property(''),
 

+ 17 - 21
ambari-web/app/views/main/dashboard.js

@@ -24,28 +24,24 @@ App.MainDashboardView = Em.View.extend({
   templateName: require('templates/main/dashboard'),
 
   selectedBinding: 'controller.selectedCategory',
-  categories: function () {
-    var categories = [
-      {
-        name: 'widgets',
-        url: 'dashboard.index',
-        label: Em.I18n.t('dashboard.widgets.title')
-      },
-      {
-        name: 'charts',
-        url: 'dashboard.charts.index',
-        label: Em.I18n.t('dashboard.heatmaps.title')
-      }
-    ];
-    if (App.get('supports.configHistory')) {
-      categories.push({
-        name: 'configHistory',
-        url: 'dashboard.configHistory',
-        label: Em.I18n.t('dashboard.configHistory.title')
-      })
+  categories: [
+    {
+      name: 'widgets',
+      url: 'dashboard.index',
+      label: Em.I18n.t('dashboard.widgets.title')
+    },
+    {
+      name: 'charts',
+      url: 'dashboard.charts.index',
+      label: Em.I18n.t('dashboard.heatmaps.title')
+    },
+    {
+      name: 'configHistory',
+      url: 'dashboard.configHistory',
+      label: Em.I18n.t('dashboard.configHistory.title')
     }
-    return categories;
-  }.property('App.supports.configHistory'),
+  ],
+
   NavItemView: Ember.View.extend({
     tagName: 'li',
     classNameBindings: 'isActive:active'.w(),

+ 3 - 14
ambari-web/app/views/main/dashboard/widgets/hbase_links.js

@@ -40,28 +40,17 @@ App.HBaseLinksView = App.LinkDashboardWidgetView.extend({
    * Passive master components
    */
   passiveMasters: function () {
-    if (App.supports.multipleHBaseMasters) {
-      return this.get('masters').filterProperty('haStatus', 'false');
-    }
-    return [];
+    return this.get('masters').filterProperty('haStatus', 'false');
   }.property('masters'),
   /**
    * One(!) active master component
    */
   activeMaster: function () {
-    if(App.supports.multipleHBaseMasters) {
-      return this.get('masters').findProperty('haStatus', 'true');
-    } else {
-      return this.get('masters')[0];
-    }
+    return this.get('masters').findProperty('haStatus', 'true');
   }.property('masters'),
 
   activeMasterTitle: function(){
-    if (App.supports.multipleHBaseMasters) {
-      return this.t('service.hbase.activeMaster');
-    } else {
-      return this.get('activeMaster.host.publicHostName');
-    }
+    return this.t('service.hbase.activeMaster');
   }.property('activeMaster'),
 
   hbaseMasterWebUrl: function () {

+ 1 - 1
ambari-web/app/views/main/host/details/host_component_view.js

@@ -205,7 +205,7 @@ App.HostComponentView = Em.View.extend({
    * @type {bool}
    */
   isReassignable: function () {
-    return App.supports.reassignMaster && App.get('components.reassignable').contains(this.get('content.componentName')) && App.router.get('mainHostController.hostsCountMap')['TOTAL'] > 1;
+    return App.get('components.reassignable').contains(this.get('content.componentName')) && App.router.get('mainHostController.hostsCountMap')['TOTAL'] > 1;
   }.property('content.componentName'),
 
   /**

+ 10 - 11
ambari-web/app/views/main/host/menu.js

@@ -22,18 +22,17 @@ App.MainHostMenuView = Em.CollectionView.extend({
   tagName: 'ul',
   classNames: ["nav", "nav-tabs"],
   content: function () {
-    var array = [ {
-      label: 'Summary',
-      routing: 'summary'
-    }
-    /* { label:'Audit', routing:'audit'} */
+    var array = [
+      {
+        label: 'Summary',
+        routing: 'summary'
+      }
+      /* { label:'Audit', routing:'audit'} */
     ];
-    if (App.supports.hostOverridesHost) {
-      array.push({
-        label: 'Configs',
-        routing: 'configs'
-      });
-    }
+    array.push({
+      label: 'Configs',
+      routing: 'configs'
+    });
     return array;
   }.property(''),
 

+ 0 - 3
ambari-web/app/views/main/host/summary.js

@@ -245,9 +245,6 @@ App.MainHostSummaryView = Em.View.extend({
    * @type {String[]}
    */
   installableClientComponents: function() {
-    if (!App.supports.deleteHost) {
-      return [];
-    }
     var clientComponents = App.StackServiceComponent.find().filterProperty('isClient');
     var installedServices = this.get('installedServices');
     var installedClients = this.get('clients').mapProperty('componentName');

+ 5 - 7
ambari-web/app/views/main/menu.js

@@ -138,13 +138,11 @@ App.MainMenuView = Em.CollectionView.extend({
           url: 'serviceAccounts',
           label: Em.I18n.t('common.serviceAccounts')
         });
-        if (App.supports.secureCluster) {
-          categories.push({
-            name: 'security',
-            url: 'security/',
-            label: Em.I18n.t('common.security')
-          });
-        }
+        categories.push({
+          name: 'security',
+          url: 'security/',
+          label: Em.I18n.t('common.security')
+        });
       }
       return categories;
     }.property('')

+ 2 - 2
ambari-web/app/views/main/service/item.js

@@ -95,7 +95,7 @@ App.MainServiceItemView = Em.View.extend({
         action: 'enableRMHighAvailability',
         label: Em.I18n.t('admin.rm_highAvailability.button.enable'),
         cssClass: 'icon-arrow-up',
-        isHidden: !App.get('supports.resourceManagerHighAvailability') || App.get('isRMHaEnabled')
+        isHidden: App.get('isRMHaEnabled')
       },
       MOVE_COMPONENT: {
         action: 'reassignMaster',
@@ -130,7 +130,7 @@ App.MainServiceItemView = Em.View.extend({
         action: this.get('controller.isSeveralClients') ? '' : 'downloadClientConfigs',
         label: Em.I18n.t('services.service.actions.downloadClientConfigs'),
         cssClass: 'icon-download-alt',
-        isHidden: !(App.get('supports.downloadClientConfigs') && this.get('controller.content.hostComponents').findProperty('isClient')),
+        isHidden: !this.get('controller.content.hostComponents').findProperty('isClient'),
         disabled: false,
         hasSubmenu: this.get('controller.isSeveralClients'),
         submenuOptions: this.get('controller.clientComponents')

+ 3 - 14
ambari-web/app/views/main/service/services/hbase.js

@@ -32,10 +32,7 @@ App.MainDashboardServiceHbaseView = App.MainDashboardServiceView.extend({
    * Passive master components
    */
   passiveMasters: function () {
-    if(App.supports.multipleHBaseMasters){
-      return this.get('masters').filterProperty('haStatus', 'false');
-    }
-    return [];
+    return this.get('masters').filterProperty('haStatus', 'false');
   }.property('masters'),
 
 
@@ -54,19 +51,11 @@ App.MainDashboardServiceHbaseView = App.MainDashboardServiceView.extend({
    * One(!) active master component
    */
   activeMaster: function () {
-    if(App.supports.multipleHBaseMasters){
-      return this.get('masters').findProperty('haStatus', 'true');
-    } else {
-      return this.get('masters')[0];
-    }
+    return this.get('masters').findProperty('haStatus', 'true');
   }.property('masters'),
 
   activeMasterTitle: function(){
-    if(App.supports.multipleHBaseMasters){
-      return this.t('service.hbase.activeMaster');
-    } else {
-      return this.get('activeMaster.host.publicHostName');
-    }
+    return this.t('service.hbase.activeMaster');
   }.property('activeMaster'),
 
   masterServerHeapSummary: function () {

+ 9 - 9
ambari-web/app/views/wizard/controls_view.js

@@ -365,7 +365,7 @@ App.ServiceConfigRadioButtons = Ember.View.extend({
    *
    * @method handleDBConnectionProperty
    **/
-  handleDBConnectionProperty: function() {
+  handleDBConnectionProperty: function () {
     if (!['addServiceController', 'installerController'].contains(App.clusterStatus.wizardControllerName)) return;
     var handledProperties = ['oozie_database', 'hive_database'];
     var currentValue = this.get('serviceConfig.value');
@@ -375,16 +375,16 @@ App.ServiceConfigRadioButtons = Ember.View.extend({
     var currentDBType = currentValue.match(databasesTypes)[0];
     var existingDatabase = /existing/gi.test(currentValue);
     // db connection check button show up if existed db selected
-    if (App.supports.databaseConnection) {
-      var propertyAppendTo1 = this.get('categoryConfigsAll').findProperty('displayName', 'Database URL');
-      if (currentDB && existingDatabase) {
-        if (handledProperties.contains(this.get('serviceConfig.name'))) {
-          if (propertyAppendTo1) propertyAppendTo1.set('additionalView', App.CheckDBConnectionView.extend({databaseName: currentDB}));
-        }
-      } else {
-        propertyAppendTo1.set('additionalView', null);
+
+    var propertyAppendTo1 = this.get('categoryConfigsAll').findProperty('displayName', 'Database URL');
+    if (currentDB && existingDatabase) {
+      if (handledProperties.contains(this.get('serviceConfig.name'))) {
+        if (propertyAppendTo1) propertyAppendTo1.set('additionalView', App.CheckDBConnectionView.extend({databaseName: currentDB}));
       }
+    } else {
+      propertyAppendTo1.set('additionalView', null);
     }
+
     // warning msg under database type radio buttons, to warn the user to setup jdbc driver if existed db selected
     var propertyHive = this.get('categoryConfigsAll').findProperty('displayName', 'Hive Database');
     var propertyOozie = this.get('categoryConfigsAll').findProperty('displayName', 'Oozie Database');

+ 1 - 9
ambari-web/test/controllers/global/update_controller_test.js

@@ -60,15 +60,7 @@ describe('App.UpdateController', function () {
       expect(App.updater.run.called).to.equal(false);
     });
 
-    it('isWorking = true, App.supports.hostOverrides = false', function () {
-      App.supports.hostOverrides = false;
-      controller.set('isWorking', true);
-      expect(App.updater.run.callCount).to.equal(5);
-      controller.set('isWorking', false);
-    });
-
-    it('isWorking = true, App.supports.hostOverrides = true', function () {
-      App.supports.hostOverrides = true;
+    it('isWorking = true', function () {
       controller.set('isWorking', true);
       expect(App.updater.run.callCount).to.equal(6);
     });

+ 0 - 5
ambari-web/test/controllers/main/host/details_test.js

@@ -1641,11 +1641,6 @@ describe('App.MainHostDetailsController', function () {
       controller.confirmDeleteHost.restore();
     });
 
-    it('App.supports.deleteHost = false', function () {
-      App.supports.deleteHost = false;
-      expect(controller.validateAndDeleteHost()).to.be.false;
-      App.supports.deleteHost = true;
-    });
     it('masterComponents exist', function () {
       controller.set('mockHostComponentsInfo', {masterComponents: [
         {}

+ 1 - 10
ambari-web/test/controllers/main/service/info/config_test.js

@@ -1040,17 +1040,10 @@ describe("App.MainServiceInfoConfigsController", function () {
       },
       {
         siteName: "mapred-queue-acls",
-        method: false,
-        capacitySchedulerUi: false
-      },
-      {
-        siteName: "mapred-queue-acls",
-        method: "createSiteObj",
-        capacitySchedulerUi: true
+        method: false
       }
     ];
 
-    var capacitySchedulerUi = App.supports.capacitySchedulerUi;
     beforeEach(function() {
       sinon.stub(mainServiceInfoConfigsController, "createCoreSiteObj", Em.K);
       sinon.stub(mainServiceInfoConfigsController, "createSiteObj", Em.K);
@@ -1060,12 +1053,10 @@ describe("App.MainServiceInfoConfigsController", function () {
     afterEach(function() {
       mainServiceInfoConfigsController.createCoreSiteObj.restore();
       mainServiceInfoConfigsController.createSiteObj.restore();
-      App.supports.capacitySchedulerUi = capacitySchedulerUi;
     });
 
     tests.forEach(function(t) {
       it("create object for " + t.siteName + " run method " + t.method, function() {
-        App.supports.capacitySchedulerUi = t.capacitySchedulerUi;
         mainServiceInfoConfigsController.set("content.serviceName", t.serviceName);
         mainServiceInfoConfigsController.createConfigObject(t.siteName, "versrion1");
         if (t.method) {

+ 0 - 61
ambari-web/test/controllers/main/service_test.js

@@ -123,67 +123,6 @@ describe('App.MainServiceController', function () {
 
   });
 
-  describe('#isAllServicesInstalled', function() {
-
-    beforeEach(function() {
-      sinon.stub(App.StackService, 'find', function() {
-        return [
-          {serviceName: 's1'},
-          {serviceName: 's2'},
-          {serviceName: 'HUE'}
-        ];
-      });
-      mainServiceController.set('content', {});
-    });
-
-    afterEach(function() {
-      App.StackService.find.restore();
-    });
-
-    it('should be false if content is not loaded', function() {
-      expect(mainServiceController.get('isAllServicesInstalled')).to.be.false;
-    });
-
-    var tests = Em.A([
-      {
-        hue: false,
-        content: ['', ''],
-        m: 'no hue',
-        e: true
-      },
-      {
-        hue: false,
-        content: [''],
-        m: 'no hue (2)',
-        e: false
-      },
-      {
-        hue: true,
-        content: ['', '', ''],
-        m: 'hue',
-        e: true
-      },
-      {
-        hue: false,
-        content: ['', ''],
-        m: 'hue (2)',
-        e: true
-      }
-    ]).forEach(function(test) {
-        it(test.m, function() {
-          mainServiceController.reopen({content: {content: test.content}});
-          sinon.stub(App, 'get', function(k) {
-            if ('supports.hue' == k) return test.hue;
-            return Em.get(App, k);
-          });
-          var r = mainServiceController.get('isAllServicesInstalled');
-          App.get.restore();
-          expect(r).to.equal(test.e);
-        });
-      });
-
-  });
-
   describe('#cluster', function() {
 
     var tests = Em.A([

+ 0 - 51
ambari-web/test/controllers/wizard/step6_test.js

@@ -357,57 +357,6 @@ describe('App.WizardStep6Controller', function () {
     });
   });
 
-  describe('#validate', function () {
-    var tests = Em.A([
-      {
-        controllerName: 'addHostController',
-        method: 'validateEachHost',
-        r: true,
-        e: true
-      },
-      {
-        controllerName: 'addHostController',
-        method: 'validateEachHost',
-        r: false,
-        e: false
-      },
-      {
-        controllerName: 'addServiceController',
-        method: 'validateEachComponent',
-        r: true,
-        e: true
-      },
-      {
-        controllerName: 'addServiceController',
-        method: 'validateEachComponent',
-        r: false,
-        e: false
-      },
-      {
-        controllerName: 'installerController',
-        method: 'validateEachComponent',
-        r: true,
-        e: true
-      },
-      {
-        controllerName: 'installerController',
-        method: 'validateEachComponent',
-        r: false,
-        e: false
-      }
-    ]);
-    tests.forEach(function (test) {
-      it(test.controllerName + ' ' + test.method + ' returns ' + test.r.toString(), function () {
-        sinon.stub(controller, test.method, function () {
-          return test.r
-        });
-        controller.set('content.controllerName', test.controllerName);
-        expect(controller.callClientSideValidation()).to.equal(test.e);
-        controller[test.method].restore();
-      });
-    });
-  });
-
   describe('#getMasterComponentsForHost', function () {
     var tests = Em.A([
       {

+ 3 - 35
ambari-web/test/controllers/wizard/step7_test.js

@@ -935,36 +935,16 @@ describe('App.InstallerStep7Controller', function () {
     });
     Em.A([
         {
-          hostOverridesInstaller: false,
           installedServiceNames: [],
-          m: 'hostOverridesInstaller is false, installedServiceNames is empty',
-          e: {
-            loadConfigGroups: false,
-            loadInstalledServicesConfigGroups: false
-          }
-        },
-        {
-          hostOverridesInstaller: false,
-          installedServiceNames: ['s1', 's2'],
-          m: 'hostOverridesInstaller is false, installedServiceNames is n\'t empty',
-          e: {
-            loadConfigGroups: false,
-            loadInstalledServicesConfigGroups: false
-          }
-        },
-        {
-          hostOverridesInstaller: true,
-          installedServiceNames: [],
-          m: 'hostOverridesInstaller is true, installedServiceNames is empty',
+          m: 'installedServiceNames is empty',
           e: {
             loadConfigGroups: true,
             loadInstalledServicesConfigGroups: false
           }
         },
         {
-          hostOverridesInstaller: true,
           installedServiceNames: ['s1', 's2', 's3'],
-          m: 'hostOverridesInstaller is true, installedServiceNames isn\'t empty',
+          m: 'installedServiceNames isn\'t empty',
           e: {
             loadConfigGroups: true,
             loadInstalledServicesConfigGroups: true
@@ -1101,14 +1081,7 @@ describe('App.InstallerStep7Controller', function () {
         allSelectedServiceNames: ['YARN'],
         fileConfigsIntoTextarea: true,
         m: 'should run fileConfigsIntoTextarea and resolveServiceDependencyConfigs',
-        resolveServiceDependencyConfigs: true,
-        capacitySchedulerUi: false
-      },
-      {
-        allSelectedServiceNames: ['YARN'],
-        m: 'shouldn\'t run fileConfigsIntoTextarea but  run resolveServiceDependencyConfigs',
-        resolveServiceDependencyConfigs: true,
-        capacitySchedulerUi: true
+        resolveServiceDependencyConfigs: true
       },
       {
         allSelectedServiceNames: ['STORM'],
@@ -1117,10 +1090,6 @@ describe('App.InstallerStep7Controller', function () {
       }
     ]).forEach(function(t) {
       it(t.m, function () {
-        sinon.stub(App, 'get', function (k) {
-          if (k === 'supports.capacitySchedulerUi') return t.capacitySchedulerUi;
-          return Em.get(App, k);
-        });
         installerStep7Controller.reopen({
           allSelectedServiceNames: t.allSelectedServiceNames
         });
@@ -1135,7 +1104,6 @@ describe('App.InstallerStep7Controller', function () {
         } else {
           expect(installerStep7Controller.resolveServiceDependencyConfigs.calledOnce).to.equal(false);
         }
-        App.get.restore();
       });
     });
   });

+ 1 - 1
ambari-web/test/controllers/wizard/step9_test.js

@@ -1138,7 +1138,7 @@ describe('App.InstallerStep9Controller', function () {
       expect(App.ajax.send.called).to.equal(false);
     });
     it('should call App.ajax.send', function () {
-      c.set('content', {cluster: {name: 'n'}, controllerName: 'installerController'});
+      c.set('content', Ember.Object.create({cluster: {name: 'n'}, controllerName: 'installerController'}));
       c.isAllComponentsInstalled();
       expect(App.ajax.send.args[0][0].data).to.eql({cluster: 'n'});
     });

+ 0 - 8
ambari-web/test/models/stack_service_component_test.js

@@ -50,7 +50,6 @@ require('models/stack_service_component');
       isMasterAddableInstallerWizard: false,
       isHAComponentOnly: false,
       isRequiredOnAllHosts: false,
-      isNotPreferableOnAmbariServerHost: false,
       defaultNoOfMasterHosts: 1,
       coHostedComponents: [],
       isOtherComponentCoHosted: false,
@@ -104,7 +103,6 @@ var componentPropertiesValidationTests = [
       isMasterAddableInstallerWizard: true,
       isHAComponentOnly: false,
       isRequiredOnAllHosts: false,
-      isNotPreferableOnAmbariServerHost: false,
       defaultNoOfMasterHosts: 3,
       coHostedComponents: [],
       isOtherComponentCoHosted: false,
@@ -135,7 +133,6 @@ var componentPropertiesValidationTests = [
       isMasterAddableInstallerWizard: false,
       isHAComponentOnly: false,
       isRequiredOnAllHosts: false,
-      isNotPreferableOnAmbariServerHost: false,
       coHostedComponents: [],
       isOtherComponentCoHosted: false,
       isCoHostedComponent: false
@@ -165,7 +162,6 @@ var componentPropertiesValidationTests = [
       isMasterAddableInstallerWizard: false,
       isHAComponentOnly: false,
       isRequiredOnAllHosts: true,
-      isNotPreferableOnAmbariServerHost: false,
       coHostedComponents: [],
       isOtherComponentCoHosted: false,
       isCoHostedComponent: false
@@ -195,7 +191,6 @@ var componentPropertiesValidationTests = [
       isMasterAddableInstallerWizard: false,
       isHAComponentOnly: false,
       isRequiredOnAllHosts: false,
-      isNotPreferableOnAmbariServerHost: false,
       coHostedComponents: [],
       isOtherComponentCoHosted: false,
       isCoHostedComponent: false
@@ -225,7 +220,6 @@ var componentPropertiesValidationTests = [
       isMasterAddableInstallerWizard: false,
       isHAComponentOnly: false,
       isRequiredOnAllHosts: false,
-      isNotPreferableOnAmbariServerHost: false,
       coHostedComponents: [],
       isOtherComponentCoHosted: false,
       isCoHostedComponent: true
@@ -255,7 +249,6 @@ var componentPropertiesValidationTests = [
       isMasterAddableInstallerWizard: false,
       isHAComponentOnly: false,
       isRequiredOnAllHosts: false,
-      isNotPreferableOnAmbariServerHost: false,
       coHostedComponents: ['HIVE_METASTORE','WEBHCAT_SERVER'],
       isOtherComponentCoHosted: true,
       isCoHostedComponent: false
@@ -285,7 +278,6 @@ var componentPropertiesValidationTests = [
       isMasterAddableInstallerWizard: false,
       isHAComponentOnly: false,
       isRequiredOnAllHosts: false,
-      isNotPreferableOnAmbariServerHost: false,
       coHostedComponents: [],
       isOtherComponentCoHosted: false,
       isCoHostedComponent: false

+ 1 - 4
ambari-web/test/models/user_test.js

@@ -103,8 +103,6 @@ describe('App.EditUserForm', function () {
             return {
               getLoginName: Em.K
             };
-          case 'supports.ldapGroupMapping':
-            return true;
           default:
             return Em.get(App, k);
         }
@@ -126,9 +124,8 @@ describe('App.EditUserForm', function () {
 
     it('should disable', function () {
       form.set('object', objectData);
-      expect(form.get('field.admin.disabled')).to.be.true;
+      expect(form.get('field.admin.disabled')).to.be.false;
     });
-
   });
 
   describe('#isValid', function () {

+ 0 - 15
ambari-web/test/views/common/configs/services_config_test.js

@@ -284,20 +284,5 @@ describe('App.ServiceConfigContainerView', function () {
       });
       expect(view.get('childViews.firstObject.serviceConfigsByCategoryView.childViews')).to.have.length(2);
     });
-    it('shouldn\'t add category with custom view if capacitySchedulerUi isn\'t active', function () {
-      sinon.stub(App, 'get', function(k) {
-        if (k === 'supports.capacitySchedulerUi') return false;
-        return Em.get(App, k);
-      });
-      view.set('controller', {
-        selectedService: {
-          configCategories: [Em.Object.create({
-            isCustomView: true
-          })]
-        }
-      });
-      expect(view.get('childViews.firstObject.serviceConfigsByCategoryView.childViews')).to.be.empty;
-      App.get.restore();
-    });
   });
 });