You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vb...@apache.org on 2015/08/24 07:35:34 UTC
ambari git commit: AMBARI-12831. BE: SQL Anywhere support for
Oozie.(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 49c7e74b3 -> 2b98a045b
AMBARI-12831. BE: SQL Anywhere support for Oozie.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2b98a045
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2b98a045
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2b98a045
Branch: refs/heads/branch-2.1
Commit: 2b98a045ba1c5ab630bc0d14935d4620101b4717
Parents: 49c7e74
Author: Vitaly Brodetskyi <vb...@hortonworks.com>
Authored: Mon Aug 24 08:35:25 2015 +0300
Committer: Vitaly Brodetskyi <vb...@hortonworks.com>
Committed: Mon Aug 24 08:35:25 2015 +0300
----------------------------------------------------------------------
.../common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml | 5 +----
.../common-services/OOZIE/4.2.0.2.3/configuration/oozie-env.xml | 1 +
.../stacks/HDP/2.2/services/OOZIE/configuration/oozie-env.xml | 3 ---
3 files changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/2b98a045/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml
index d5b08c9..bc42bc6 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml
@@ -142,10 +142,7 @@ export OOZIE_ADMIN_PORT={{oozie_server_admin_port}}
# export OOZIE_BASE_URL="http://${OOZIE_HTTP_HOSTNAME}:${OOZIE_HTTP_PORT}/oozie"
export JAVA_LIBRARY_PATH={{hadoop_lib_home}}/native/Linux-amd64-64
-{% if sqla_db_used %}
-export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:{{jdbc_libs_dir}}"
-{% endif %}
- </value>
+ </value>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2b98a045/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-env.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-env.xml
index 2b8e754..46ba243 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-env.xml
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-env.xml
@@ -97,6 +97,7 @@ export OOZIE_CLIENT_OPTS="${OOZIE_CLIENT_OPTS} -Doozie.connection.retry.count=5
{% if sqla_db_used %}
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:{{jdbc_libs_dir}}"
+export JAVA_LIBRARY_PATH="$JAVA_LIBRARY_PATH:{{jdbc_libs_dir}}"
{% endif %}
</value>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2b98a045/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/configuration/oozie-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/configuration/oozie-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/configuration/oozie-env.xml
index 0611cac..f0621cd 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/configuration/oozie-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/configuration/oozie-env.xml
@@ -101,9 +101,6 @@ export CATALINA_OPTS="${CATALINA_OPTS} -Xmx2048m -XX:MaxPermSize=256m "
export CATALINA_OPTS="${CATALINA_OPTS} -Xmx2048m"
{% endif %}
-{% if sqla_db_used %}
-export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:{{jdbc_libs_dir}}"
-{% endif %}
</value>
</property>