SLIDER-153 revert rename -> slider for bash
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/150b589b Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/150b589b Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/150b589b Branch: refs/heads/feature/SLIDER-151_Implement_full_slider_API_in_REST_and_switch_client_to_it Commit: 150b589b72dae4c4b857a6b19205f6ce11f63d39 Parents: 1c5f303 Author: Steve Loughran <ste...@apache.org> Authored: Wed Jun 25 11:22:20 2014 -0700 Committer: Steve Loughran <ste...@apache.org> Committed: Wed Jun 25 11:22:20 2014 -0700 ---------------------------------------------------------------------- slider-assembly/src/main/scripts/slider | 74 +++++++++++++++++++++++++ slider-assembly/src/main/scripts/slider.sh | 74 ------------------------- 2 files changed, 74 insertions(+), 74 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/150b589b/slider-assembly/src/main/scripts/slider ---------------------------------------------------------------------- diff --git a/slider-assembly/src/main/scripts/slider b/slider-assembly/src/main/scripts/slider new file mode 100755 index 0000000..caf275b --- /dev/null +++ b/slider-assembly/src/main/scripts/slider @@ -0,0 +1,74 @@ +#!/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. + + +# this is the shell script to start Slider deploying an application +# Usage: slider <action> <commands> + +# The env variable SLIDER_JVM_OPTS can be used to override +# the default JVM opts + +function usage +{ + echo "Usage: slider <action> <arguments>" + echo "" +} + +# Slider works out its own location +this="${BASH_SOURCE-$0}" +bindir=$(cd -P -- "$(dirname -- "$this")" && pwd -P) +script="$(basename -- "$this")" + +# lib directory is one up; it is expected to contain +# slider.jar and any other dependencies that are not in the +# standard Hadoop classpath + +slider_home="${bindir}/.." +slider_home=`cd -P "${slider_home}" && pwd -P` + +libdir="${slider_home}/lib" +libdir=`cd -P "${libdir}" && pwd -P` + + +confdir="${slider_home}/conf" + +# normalize the conf dir so it can be passed down +confdir=`cd -P "${confdir}" && pwd -P` +confdir=${SLIDER_CONF_DIR:-$confdir} + + +slider_jvm_opts="-Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Xmx256m -Djava.confdir=${confdir}" +slider_jvm_opts=${SLIDER_JVM_OPTS:-$slider_jvm_opts} + +# allow for an extra classpath +slider_classpath_extra=${SLIDER_CLASSPATH_EXTRA:-""} + +slider_classpath="${libdir}/*:${confdir}:${slider_classpath_extra}" + +launcher=org.apache.slider.Slider + + +echo "slider_home = \"${slider_home}\"" +echo "slider_jvm_opts = \"${slider_jvm_opts}\"" +echo "classpath = \"${slider_classpath}\"" +export CLASSPATH="${slider_classpath}" +echo "" + +echo "command is java ${slider_jvm_opts} --classpath \"${slider_classpath}\" ${launcher} $@" +echo "" +echo "" +exec java ${slider_jvm_opts} ${launcher} $@ http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/150b589b/slider-assembly/src/main/scripts/slider.sh ---------------------------------------------------------------------- diff --git a/slider-assembly/src/main/scripts/slider.sh b/slider-assembly/src/main/scripts/slider.sh deleted file mode 100755 index caf275b..0000000 --- a/slider-assembly/src/main/scripts/slider.sh +++ /dev/null @@ -1,74 +0,0 @@ -#!/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. - - -# this is the shell script to start Slider deploying an application -# Usage: slider <action> <commands> - -# The env variable SLIDER_JVM_OPTS can be used to override -# the default JVM opts - -function usage -{ - echo "Usage: slider <action> <arguments>" - echo "" -} - -# Slider works out its own location -this="${BASH_SOURCE-$0}" -bindir=$(cd -P -- "$(dirname -- "$this")" && pwd -P) -script="$(basename -- "$this")" - -# lib directory is one up; it is expected to contain -# slider.jar and any other dependencies that are not in the -# standard Hadoop classpath - -slider_home="${bindir}/.." -slider_home=`cd -P "${slider_home}" && pwd -P` - -libdir="${slider_home}/lib" -libdir=`cd -P "${libdir}" && pwd -P` - - -confdir="${slider_home}/conf" - -# normalize the conf dir so it can be passed down -confdir=`cd -P "${confdir}" && pwd -P` -confdir=${SLIDER_CONF_DIR:-$confdir} - - -slider_jvm_opts="-Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Xmx256m -Djava.confdir=${confdir}" -slider_jvm_opts=${SLIDER_JVM_OPTS:-$slider_jvm_opts} - -# allow for an extra classpath -slider_classpath_extra=${SLIDER_CLASSPATH_EXTRA:-""} - -slider_classpath="${libdir}/*:${confdir}:${slider_classpath_extra}" - -launcher=org.apache.slider.Slider - - -echo "slider_home = \"${slider_home}\"" -echo "slider_jvm_opts = \"${slider_jvm_opts}\"" -echo "classpath = \"${slider_classpath}\"" -export CLASSPATH="${slider_classpath}" -echo "" - -echo "command is java ${slider_jvm_opts} --classpath \"${slider_classpath}\" ${launcher} $@" -echo "" -echo "" -exec java ${slider_jvm_opts} ${launcher} $@