ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jai...@apache.org
Subject git commit: AMBARI-5215. Remove hive_jdbc_driver and oozie_jdbc_driver properties from global configuration. (jaimin)
Date Tue, 25 Mar 2014 21:52:27 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 30d52d258 -> 1bdc77435


AMBARI-5215. Remove hive_jdbc_driver and oozie_jdbc_driver properties from global configuration.
(jaimin)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1bdc7743
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1bdc7743
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1bdc7743

Branch: refs/heads/trunk
Commit: 1bdc774351ef15c08c6515948fe36072bd1f67de
Parents: 30d52d2
Author: Jaimin Jetly <jaimin@hortonworks.com>
Authored: Tue Mar 25 14:52:00 2014 -0700
Committer: Jaimin Jetly <jaimin@hortonworks.com>
Committed: Tue Mar 25 14:52:00 2014 -0700

----------------------------------------------------------------------
 ambari-web/app/controllers/wizard/step8_controller.js | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/1bdc7743/ambari-web/app/controllers/wizard/step8_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step8_controller.js b/ambari-web/app/controllers/wizard/step8_controller.js
index 0e7c356..f7f61de 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -224,7 +224,6 @@ App.WizardStep8Controller = Em.Controller.extend({
   removeHiveConfigs: function(globals) {
     var hiveDb = globals.findProperty('name', 'hive_database');
     var hiveDbType = {name: 'hive_database_type', value: 'mysql'};
-    var hiveJdbcDriver = {name: 'hive_jdbc_driver'};
 
     var hive_properties = Em.A([]);
 
@@ -232,7 +231,6 @@ App.WizardStep8Controller = Em.Controller.extend({
       if (globals.someProperty('name', 'hive_ambari_host')) {
         globals.findProperty('name', 'hive_hostname').value = globals.findProperty('name',
'hive_ambari_host').value;
         hiveDbType.value = 'mysql';
-        hiveJdbcDriver.value = 'com.mysql.jdbc.Driver';
       }
       hive_properties.pushObjects(Em.A(['hive_existing_mysql_host','hive_existing_mysql_database','hive_existing_oracle_host','hive_existing_oracle_database']));
     }
@@ -240,13 +238,11 @@ App.WizardStep8Controller = Em.Controller.extend({
       if (hiveDb.value === 'Existing MySQL Database') {
         globals.findProperty('name', 'hive_hostname').value = globals.findProperty('name',
'hive_existing_mysql_host').value;
         hiveDbType.value = 'mysql';
-        hiveJdbcDriver.value = 'com.mysql.jdbc.Driver';
         hive_properties.pushObjects(Em.A(['hive_ambari_host','hive_ambari_database','hive_existing_oracle_host','hive_existing_oracle_database']));
       }
       else { //existing oracle database
         globals.findProperty('name', 'hive_hostname').value = globals.findProperty('name',
'hive_existing_oracle_host').value;
         hiveDbType.value = 'oracle';
-        hiveJdbcDriver.value = 'oracle.jdbc.driver.OracleDriver';
         hive_properties.pushObjects(Em.A(['hive_ambari_host','hive_ambari_database','hive_existing_mysql_host','hive_existing_mysql_database']));
       }
     }
@@ -255,7 +251,7 @@ App.WizardStep8Controller = Em.Controller.extend({
       globals = globals.without(globals.findProperty('name', property));
     });
 
-    globals.pushObjects([hiveDbType, hiveJdbcDriver]);
+    globals.pushObject(hiveDbType);
     return globals;
   },
 
@@ -267,27 +263,23 @@ App.WizardStep8Controller = Em.Controller.extend({
   removeOozieConfigs: function(globals) {
     var oozieDb = globals.findProperty('name', 'oozie_database');
     var oozieDbType = {name:'oozie_database_type'};
-    var oozieJdbcDriver = {name: 'oozie_jdbc_driver'};
 
     var oozie_properties = Em.A(['oozie_ambari_host','oozie_ambari_database']);
 
     if (oozieDb.value === 'New Derby Database') {
       globals.findProperty('name', 'oozie_hostname').value = globals.findProperty('name',
'oozie_ambari_host').value;
       oozieDbType.value = 'derby';
-      oozieJdbcDriver.value = 'org.apache.derby.jdbc.EmbeddedDriver';
       oozie_properties.pushObjects(Em.A(['oozie_existing_mysql_host','oozie_existing_mysql_database','oozie_existing_oracle_host','oozie_existing_oracle_database']));
     }
     else {
       if (oozieDb.value === 'Existing MySQL Database') {
         globals.findProperty('name', 'oozie_hostname').value = globals.findProperty('name',
'oozie_existing_mysql_host').value;
         oozieDbType.value = 'mysql';
-        oozieJdbcDriver.value = 'com.mysql.jdbc.Driver';
         oozie_properties.pushObjects(Em.A(['oozie_existing_oracle_host','oozie_existing_oracle_database','oozie_derby_database']));
       }
       else { // existing oracle database
         globals.findProperty('name', 'oozie_hostname').value = globals.findProperty('name',
'oozie_existing_oracle_host').value;
         oozieDbType.value = 'oracle';
-        oozieJdbcDriver.value = 'oracle.jdbc.driver.OracleDriver';
         oozie_properties.pushObjects(Em.A(['oozie_existing_mysql_host','oozie_existing_mysql_database','oozie_derby_database']));
       }
     }
@@ -296,7 +288,7 @@ App.WizardStep8Controller = Em.Controller.extend({
       globals = globals.without(globals.findProperty('name', property));
     });
 
-    globals.pushObjects([oozieDbType, oozieJdbcDriver]);
+    globals.pushObject(oozieDbType);
     return globals;
   },
 


Mime
View raw message