You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2013/05/30 18:51:02 UTC
svn commit: r1487929 - in /incubator/ambari/trunk: CHANGES.txt
ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-env.sh.erb
ambari-server/src/main/python/ambari-server.py
Author: smohanty
Date: Thu May 30 16:51:01 2013
New Revision: 1487929
URL: http://svn.apache.org/r1487929
Log:
AMBARI-2229. Oracle driver loading broken on agent side. (smohanty)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-env.sh.erb
incubator/ambari/trunk/ambari-server/src/main/python/ambari-server.py
Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1487929&r1=1487928&r2=1487929&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Thu May 30 16:51:01 2013
@@ -907,6 +907,8 @@ Trunk (unreleased changes):
BUG FIXES
+ AMBARI-2229. Oracle driver loading broken on agent side. (smohanty)
+
AMBARI-2228. Fix MySQL and Oracle DDL scripts according to last DB
changes. (smohanty)
Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-env.sh.erb
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-env.sh.erb?rev=1487929&r1=1487928&r2=1487929&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-env.sh.erb (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-env.sh.erb Thu May 30 16:51:01 2013
@@ -96,12 +96,12 @@ export HADOOP_IDENT_STRING=$USER
# Use libraries from standard classpath
JAVA_JDBC_LIBS=""
#Add libraries required by mysql connector
-for jarFile in `ls /usr/share/java/*mysql*i 2>/dev/null`
+for jarFile in `ls /usr/share/java/*mysql* 2>/dev/null`
do
JAVA_JDBC_LIBS=${JAVA_JDBC_LIBS}:$jarFile
done
#Add libraries required by oracle connector
-for jarFile in `ls /usr/share/java/*oracle* 2>/dev/null`
+for jarFile in `ls /usr/share/java/*ojdbc* 2>/dev/null`
do
JAVA_JDBC_LIBS=${JAVA_JDBC_LIBS}:$jarFile
done
Modified: incubator/ambari/trunk/ambari-server/src/main/python/ambari-server.py
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/python/ambari-server.py?rev=1487929&r1=1487928&r2=1487929&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/main/python/ambari-server.py (original)
+++ incubator/ambari/trunk/ambari-server/src/main/python/ambari-server.py Thu May 30 16:51:01 2013
@@ -456,7 +456,7 @@ def get_share_jars():
share_jars = ""
file_list = []
file_list.extend(glob.glob(JAVA_SHARE_PATH + os.sep + "*mysql*"))
- file_list.extend(glob.glob(JAVA_SHARE_PATH + os.sep + "*oracle*"))
+ file_list.extend(glob.glob(JAVA_SHARE_PATH + os.sep + "*ojdbc*"))
if len(file_list) > 0:
share_jars = string.join(file_list, os.pathsep)
return share_jars