[1/5] Revert "AMBARI-2989 UI needs ability to categorize, name and describe non-global configurations. (atkach)"

[srimanth]

Updated Branches:
  refs/heads/trunk 4b6ae77bb -> 43198bf60


http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/43198bf6/ambari-web/app/data/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/site_properties.js 
b/ambari-web/app/data/site_properties.js
deleted file mode 100644
index bc68d25..0000000
--- a/ambari-web/app/data/site_properties.js
+++ /dev/null
@@ -1,22 +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.
- */
-module.exports =
-{
-  "configProperties": [
-  ]
-};

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/43198bf6/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index 6918d62..3bce8c6 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -26,31 +26,25 @@ var globalPropertyToServicesMap = null;
 App.config = Em.Object.create({
 
   preDefinedServiceConfigs: function(){
-    var configs = this.get('preDefinedGlobalProperties');
+    var configs = this.get('preDefinedConfigProperties');
     var services = [];
     require('data/service_configs').forEach(function(service){
       service.configs = configs.filterProperty('serviceName', 
service.serviceName);
       services.push(service);
     });
     return services;
-  }.property('preDefinedGlobalProperties'),
+  }.property('preDefinedConfigProperties'),
   configMapping: function() {
       if (App.get('isHadoop2Stack')) {
         return require('data/HDP2/config_mapping');
       }
     return require('data/config_mapping');
   }.property('App.isHadoop2Stack'),
-  preDefinedGlobalProperties: function() {
+  preDefinedConfigProperties: function() {
     if (App.get('isHadoop2Stack')) {
-      return require('data/HDP2/global_properties').configProperties;
+      return require('data/HDP2/config_properties').configProperties;
     }
-    return require('data/global_properties').configProperties;
-  }.property('App.isHadoop2Stack'),
-  preDefinedSiteProperties: function() {
-    if (App.get('isHadoop2Stack')) {
-      return require('data/HDP2/site_properties').configProperties;
-    }
-    return require('data/site_properties').configProperties;
+    return require('data/config_properties').configProperties;
   }.property('App.isHadoop2Stack'),
   preDefinedCustomConfigs: function () {
     if (App.get('isHadoop2Stack')) {
@@ -168,7 +162,7 @@ App.config = Em.Object.create({
   mergePreDefinedWithLoaded: function (configGroups, advancedConfigs, tags, 
serviceName) {
     var configs = [];
     var globalConfigs = [];
-    var preDefinedConfigs = 
this.get('preDefinedGlobalProperties').concat(this.get('preDefinedSiteProperties'));
+    var preDefinedConfigs = this.get('preDefinedConfigProperties');
     var mappingConfigs = [];
 
     tags.forEach(function (_tag) {
@@ -212,7 +206,7 @@ App.config = Em.Object.create({
           if (configsPropertyDef) {
             this.handleSpecialProperties(serviceConfigObj);
           } else {
-            serviceConfigObj.isVisible = false;  // if the global property is 
not defined on ui metadata global_properties.js then it shouldn't be a part of 
errorCount
+            serviceConfigObj.isVisible = false;  // if the global property is 
not defined on ui metadata config_properties.js then it shouldn't be a part of 
errorCount
           }
           serviceConfigObj.id = 'puppet var';
           serviceConfigObj.displayName = configsPropertyDef ? 
configsPropertyDef.displayName : null;
@@ -246,14 +240,14 @@ App.config = Em.Object.create({
    */
   mergePreDefinedWithStored: function (storedConfigs, advancedConfigs) {
     var mergedConfigs = [];
-    var preDefinedConfigs = $.extend(true, [], 
this.get('preDefinedGlobalProperties').concat(this.get('preDefinedSiteProperties')));
+    var preDefinedConfigs = $.extend(true, [], 
this.get('preDefinedConfigProperties'));
     var preDefinedNames = [];
     var storedNames = [];
     var names = [];
     var categoryMetaData = null;
     storedConfigs = (storedConfigs) ? storedConfigs : [];
 
-    preDefinedNames = preDefinedConfigs.mapProperty('name');
+    preDefinedNames = 
this.get('preDefinedConfigProperties').mapProperty('name');
     storedNames = storedConfigs.mapProperty('name');
     names = preDefinedNames.concat(storedNames).uniq();
     names.forEach(function (name) {