AMBARI-2178. Fix JDBC URLs for connecting to Oracle from Hive Metastore and Oozie Server. (yusaku)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1485456 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -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

ambari-web/app/config.js

@@ -47,7 +47,7 @@ App.supports = {
   stackUpgrade: false,
   capacitySchedulerUi: false,
   startStopAllServices: false,
-  hiveOozieExtraDatabases: false,
+  hiveOozieExtraDatabases: true,
   multipleHBaseMasters: false,
   addMasters: false,
   customizeSmokeTestUser: true,

ambari-web/app/controllers/wizard/step8_controller.js

@@ -1518,8 +1518,8 @@ App.WizardStep8Controller = Em.Controller.extend({
       } 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.Controller.extend({
       } 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";
       }
     }