Return-Path: X-Original-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CCFEFD31E for ; Thu, 10 Jan 2013 20:24:50 +0000 (UTC) Received: (qmail 4147 invoked by uid 500); 10 Jan 2013 20:24:50 -0000 Delivered-To: apmail-incubator-ambari-commits-archive@incubator.apache.org Received: (qmail 4120 invoked by uid 500); 10 Jan 2013 20:24:50 -0000 Mailing-List: contact ambari-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@incubator.apache.org Delivered-To: mailing list ambari-commits@incubator.apache.org Received: (qmail 4109 invoked by uid 99); 10 Jan 2013 20:24:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Jan 2013 20:24:50 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Jan 2013 20:24:49 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 02C4923888EA; Thu, 10 Jan 2013 20:24:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1431611 - in /incubator/ambari/trunk: ./ ambari-web/app/assets/data/wizard/stack/hdp/version01/ ambari-web/app/controllers/wizard/ ambari-web/app/mappers/ ambari-web/app/models/ Date: Thu, 10 Jan 2013 20:24:29 -0000 To: ambari-commits@incubator.apache.org From: yusaku@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130110202430.02C4923888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: yusaku Date: Thu Jan 10 20:24:29 2013 New Revision: 1431611 URL: http://svn.apache.org/viewvc?rev=1431611&view=rev Log: AMBARI-1147. Handling Hive/HCat/WebHCat configuration parameters with Ambari Web. (yusaku) Added: incubator/ambari/trunk/ambari-web/app/assets/data/wizard/stack/hdp/version01/HCATALOG.json Modified: incubator/ambari/trunk/CHANGES.txt incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js incubator/ambari/trunk/ambari-web/app/mappers/service_mapper.js incubator/ambari/trunk/ambari-web/app/models/service.js Modified: incubator/ambari/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1431611&r1=1431610&r2=1431611&view=diff ============================================================================== --- incubator/ambari/trunk/CHANGES.txt (original) +++ incubator/ambari/trunk/CHANGES.txt Thu Jan 10 20:24:29 2013 @@ -14,6 +14,9 @@ AMBARI-666 branch (unreleased changes) NEW FEATURES + AMBARI-1147. Handling Hive/HCat/WebHCat configuration parameters with + Ambari Web. (yusaku) + AMBARI-946. Support retrieving information for multiple requests. (hitesh via mahadev) Added: incubator/ambari/trunk/ambari-web/app/assets/data/wizard/stack/hdp/version01/HCATALOG.json URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/assets/data/wizard/stack/hdp/version01/HCATALOG.json?rev=1431611&view=auto ============================================================================== --- incubator/ambari/trunk/ambari-web/app/assets/data/wizard/stack/hdp/version01/HCATALOG.json (added) +++ incubator/ambari/trunk/ambari-web/app/assets/data/wizard/stack/hdp/version01/HCATALOG.json Thu Jan 10 20:24:29 2013 @@ -0,0 +1,20 @@ +{ + "name" : "HCATALOG", + "version" : "0.4.0.1-1", + "user" : "root", + "comment" : "This is comment for HCATALOG service", + "properties" : [ ], + "components" : [ { + "name" : "HCAT", + "category" : "CLIENT", + "client" : true, + "master" : false + } ], + "clientOnlyService" : true, + "clientComponent" : { + "name" : "HCAT", + "category" : "CLIENT", + "client" : true, + "master" : false + } +} \ No newline at end of file Modified: incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js?rev=1431611&r1=1431610&r2=1431611&view=diff ============================================================================== --- incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js (original) +++ incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js Thu Jan 10 20:24:29 2013 @@ -905,16 +905,19 @@ App.WizardStep8Controller = Em.Controlle var hostNames = clientHosts.mapProperty('hostName').splice(0); switch (_client.component_name) { case 'HDFS_CLIENT': - // install HDFS_CLIENT on HBASE_MASTER and HBASE_REGIONSERVER hosts + // install HDFS_CLIENT on HBASE_MASTER, HBASE_REGIONSERVER, and WEBHCAT_SERVER hosts masterHosts.filterProperty('component', 'HBASE_MASTER').filterProperty('isInstalled', false).forEach(function (_masterHost) { hostNames.pushObject(_masterHost.hostName); }, this); masterHosts.filterProperty('component', 'HBASE_REGIONSERVER').filterProperty('isInstalled', false).forEach(function (_masterHost) { hostNames.pushObject(_masterHost.hostName); }, this); + masterHosts.filterProperty('component', 'WEBHCAT_SERVER').filterProperty('isInstalled', false).forEach(function (_masterHost) { + hostNames.pushObject(_masterHost.hostName); + }, this); break; case 'MAPREDUCE_CLIENT': - // install MAPREDUCE_CLIENT on HIVE_SERVER, OOZIE_SERVER, and NAGIOS_SERVER hosts + // install MAPREDUCE_CLIENT on HIVE_SERVER, OOZIE_SERVER, NAGIOS_SERVER, and WEBHCAT_SERVER hosts masterHosts.filterProperty('component', 'HIVE_SERVER').filterProperty('isInstalled', false).forEach(function (_masterHost) { hostNames.pushObject(_masterHost.hostName); }, this); @@ -924,6 +927,9 @@ App.WizardStep8Controller = Em.Controlle masterHosts.filterProperty('component', 'NAGIOS_SERVER').filterProperty('isInstalled', false).forEach(function (_masterHost) { hostNames.pushObject(_masterHost.hostName); }, this); + masterHosts.filterProperty('component', 'WEBHCAT_SERVER').filterProperty('isInstalled', false).forEach(function (_masterHost) { + hostNames.pushObject(_masterHost.hostName); + }, this); break; case 'OOZIE_CLIENT': // install OOZIE_CLIENT on NAGIOS_SERVER host @@ -931,6 +937,12 @@ App.WizardStep8Controller = Em.Controlle hostNames.pushObject(_masterHost.hostName); }, this); break; + case 'ZOOKEEPER_CLIENT': + // install ZOOKEEPER_CLIENT on WEBHCAT_SERVER host + masterHosts.filterProperty('component', 'WEBHCAT_SERVER').filterProperty('isInstalled', false).forEach(function (_masterHost) { + hostNames.pushObject(_masterHost.hostName); + }, this); + break; } hostNames = hostNames.uniq(); this.registerHostsToComponent(hostNames, _client.component_name); Modified: incubator/ambari/trunk/ambari-web/app/mappers/service_mapper.js URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/mappers/service_mapper.js?rev=1431611&r1=1431610&r2=1431611&view=diff ============================================================================== --- incubator/ambari/trunk/ambari-web/app/mappers/service_mapper.js (original) +++ incubator/ambari/trunk/ambari-web/app/mappers/service_mapper.js Thu Jan 10 20:24:29 2013 @@ -21,6 +21,7 @@ App.servicesMapper = App.QuickDataMapper 'MAPREDUCE', 'HBASE', 'HIVE', + 'WEBHCAT', 'OOZIE', 'GANGLIA', 'NAGIOS', Modified: incubator/ambari/trunk/ambari-web/app/models/service.js URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/models/service.js?rev=1431611&r1=1431610&r2=1431611&view=diff ============================================================================== --- incubator/ambari/trunk/ambari-web/app/models/service.js (original) +++ incubator/ambari/trunk/ambari-web/app/models/service.js Thu Jan 10 20:24:29 2013 @@ -66,6 +66,7 @@ App.Service = DS.Model.extend({ "HBASE", "OOZIE", "HIVE", + "WEBHCAT", "ZOOKEEPER", "PIG", "SQOOP" @@ -101,7 +102,7 @@ App.Service = DS.Model.extend({ case 'oozie': return 'Oozie'; case 'hive': - return 'Hive/HCatalog'; + return 'Hive/HCat'; case 'zookeeper': return 'ZooKeeper'; case 'pig':