Author: yusaku
Date: Wed May 22 22:00:32 2013
New Revision: 1485456
URL: http://svn.apache.org/r1485456
Log:
AMBARI-2178. Fix JDBC URLs for connecting to Oracle from Hive Metastore and
Oozie Server. (yusaku)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/config.js
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1485456&r1=1485455&r2=1485456&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Wed May 22 22:00:32 2013
@@ -882,6 +882,9 @@ Trunk (unreleased changes):
BUG FIXES
+ AMBARI-2178. Fix JDBC URLs for connecting to Oracle from Hive Metastore and
+ Oozie Server. (yusaku)
+
AMBARI-2172. Fix unit tests for Ambari Web. (yusaku)
AMBARI-2171. Host status filter not restored on Hosts page when navigating
Modified: incubator/ambari/trunk/ambari-web/app/config.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/config.js?rev=1485456&r1=1485455&r2=1485456&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/config.js (original)
+++ incubator/ambari/trunk/ambari-web/app/config.js Wed May 22 22:00:32 2013
@@ -47,7 +47,7 @@ App.supports = {
stackUpgrade: false,
capacitySchedulerUi: false,
startStopAllServices: false,
- hiveOozieExtraDatabases: false,
+ hiveOozieExtraDatabases: true,
multipleHBaseMasters: false,
addMasters: false,
customizeSmokeTestUser: true,
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=1485456&r1=1485455&r2=1485456&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
Wed May 22 22:00:32 2013
@@ -1518,8 +1518,8 @@ App.WizardStep8Controller = Em.Controlle
} else if (oozieDb.value === 'Existing MySQL Database'){
oozieProperties["oozie.service.JPAService.jdbc.url"] = "jdbc:mysql://"
+ oozieHost + "/" + oozieDbName + "?createDatabaseIfNotExist=true";
oozieProperties["oozie.service.JPAService.jdbc.driver"] =
"com.mysql.jdbc.Driver";
- } else{ //existing oracle database
- oozieProperties["oozie.service.JPAService.jdbc.url"] =
"jdbc:oracle://" + oozieHost + "/" + oozieDbName +
"?createDatabaseIfNotExist=true";
+ } else { //existing oracle database
+ oozieProperties["oozie.service.JPAService.jdbc.url"] =
"jdbc:oracle:thin:@//" + oozieHost + ":1521/" + oozieDbName;
oozieProperties["oozie.service.JPAService.jdbc.driver"] =
"oracle.jdbc.driver.OracleDriver";
}
//set oozie username and password
@@ -1547,8 +1547,8 @@ App.WizardStep8Controller = Em.Controlle
} else if (hiveDb.value === 'Existing MySQL Database'){
hiveProperties["javax.jdo.option.ConnectionURL"] = "jdbc:mysql://"+
hiveHost + "/" + hiveDbName + "?createDatabaseIfNotExist=true";
hiveProperties["javax.jdo.option.ConnectionDriverName"] =
"com.mysql.jdbc.Driver";
- } else{ //existing oracle database
- hiveProperties["javax.jdo.option.ConnectionURL"] = "jdbc:oracle://"+
hiveHost + "/" + hiveDbName + "?createDatabaseIfNotExist=true";
+ } else { //existing oracle database
+ hiveProperties["javax.jdo.option.ConnectionURL"] =
"jdbc:oracle:thin:@//"+ hiveHost + ":1521/" + hiveDbName;
hiveProperties["javax.jdo.option.ConnectionDriverName"] =
"oracle.jdbc.driver.OracleDriver";
}
}
