Repository: oozie Updated Branches: refs/heads/master b869369ad -> 340d55977
OOZIE-2185 Make oozie cli source conf/oozie-client-env.sh (grimesmi via rkanter) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/340d5597 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/340d5597 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/340d5597 Branch: refs/heads/master Commit: 340d55977f103dcff72b511a9202597bbe4eb635 Parents: b869369 Author: Robert Kanter <[email protected]> Authored: Thu Dec 10 18:40:17 2015 -0800 Committer: Robert Kanter <[email protected]> Committed: Thu Dec 10 18:40:17 2015 -0800 ---------------------------------------------------------------------- client/src/main/bin/oozie | 8 +++++ client/src/main/conf/oozie-client-env.sh | 40 +++++++++++++++++++++++ docs/src/site/twiki/DG_CommandLineTool.twiki | 3 +- release-log.txt | 1 + src/main/assemblies/client.xml | 9 +++++ 5 files changed, 60 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/340d5597/client/src/main/bin/oozie ---------------------------------------------------------------------- diff --git a/client/src/main/bin/oozie b/client/src/main/bin/oozie index e1e584e..88b06e8 100644 --- a/client/src/main/bin/oozie +++ b/client/src/main/bin/oozie @@ -33,6 +33,14 @@ done BASEDIR=`dirname ${PRG}` BASEDIR=`cd ${BASEDIR}/..;pwd` +if [ -r "${BASEDIR}/conf/oozie-client-env.sh" ]; then + source "${BASEDIR}/conf/oozie-client-env.sh" +fi + +if [ "${OOZIE_URL}" = "" ]; then + export OOZIE_URL="http://$(hostname -f):11000/oozie" +fi + #Create lib directory from war if lib doesn't exist if [ ! -d "${BASEDIR}/lib" ]; then mkdir ${BASEDIR}/lib http://git-wip-us.apache.org/repos/asf/oozie/blob/340d5597/client/src/main/conf/oozie-client-env.sh ---------------------------------------------------------------------- diff --git a/client/src/main/conf/oozie-client-env.sh b/client/src/main/conf/oozie-client-env.sh new file mode 100644 index 0000000..12e535d --- /dev/null +++ b/client/src/main/conf/oozie-client-env.sh @@ -0,0 +1,40 @@ +#!/usr/bin/env bash +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# Oozie URL - used as the value for the '-oozie' option if set +# The URL the Oozie server is listening on +# +# export OOZIE_URL=http://$(hostname -f):11000/oozie + +# Timezone - used as the value for the '-timezone' option if set +# Options: See 'oozie info -timezones' for a list +# +# export OOZIE_TIMEZONE=GMT + +# Authenticaton type - used as value for the '-auth' option if set +# Note that Oozie normally determines this automatically so you usually won't need to set it +# Options: [SIMPLE|KERBEROS] +# +# export OOZIE_AUTH=SIMPLE + +# Oozie client java options +# Use this to set specific JVM options for the Oozie client +# +# export OOZIE_CLIENT_OPTS= + http://git-wip-us.apache.org/repos/asf/oozie/blob/340d5597/docs/src/site/twiki/DG_CommandLineTool.twiki ---------------------------------------------------------------------- diff --git a/docs/src/site/twiki/DG_CommandLineTool.twiki b/docs/src/site/twiki/DG_CommandLineTool.twiki index 1823247..ff1cce5 100644 --- a/docs/src/site/twiki/DG_CommandLineTool.twiki +++ b/docs/src/site/twiki/DG_CommandLineTool.twiki @@ -220,7 +220,8 @@ restrict from which hosts a user may impersonate users, as well as users of whic ---+++ Oozie URL All =oozie= CLI sub-commands expect the <code>-oozie OOZIE_URL</code> option indicating the URL of the Oozie system -to run the command against. +to run the command against. If the OOZIE_URL environment variable has not been set, =oozie= will use the default +URL specified in oozie-client-env.sh (equivalent to =!http://$(hostname -f):11000/oozie=). If the <code>-oozie</code> option is not specified, the =oozie= CLI will look for the =OOZIE_URL= environment variable and uses it if set. http://git-wip-us.apache.org/repos/asf/oozie/blob/340d5597/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index a844f4e..b06735c 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.3.0 release (trunk - unreleased) +OOZIE-2185 Make oozie cli source conf/oozie-client-env.sh (grimesmi via rkanter) OOZIE-2413 Kerberos credentials can expire if the KDC is slow to respond (rkanter) OOZIE-2411 Add BCC to oozie email action (fdenes via rkanter) OOZIE-2397 LAST_ONLY and NONE don't properly handle READY actions (rkanter) http://git-wip-us.apache.org/repos/asf/oozie/blob/340d5597/src/main/assemblies/client.xml ---------------------------------------------------------------------- diff --git a/src/main/assemblies/client.xml b/src/main/assemblies/client.xml index db252f5..cc43774 100644 --- a/src/main/assemblies/client.xml +++ b/src/main/assemblies/client.xml @@ -47,6 +47,15 @@ </includes> <fileMode>0755</fileMode> </fileSet> + + <fileSet> + <directory>${basedir}/src/main/conf</directory> + <outputDirectory>oozie-client-${project.version}/conf</outputDirectory> + <includes> + <include>*</include> + </includes> + <fileMode>0755</fileMode> + </fileSet> </fileSets> <dependencySets>
