Author: ivank
Date: Tue Jun 10 10:01:45 2014
New Revision: 1601592
URL: http://svn.apache.org/r1601592
Log:
BOOKKEEPER-765 bookkeeper script should fall back to java in path if JAVA_HOME
is not set (ivank)
Modified:
zookeeper/bookkeeper/trunk/CHANGES.txt
zookeeper/bookkeeper/trunk/bookkeeper-server/bin/bookkeeper
zookeeper/bookkeeper/trunk/bookkeeper-server/conf/bkenv.sh
zookeeper/bookkeeper/trunk/hedwig-server/bin/hedwig
zookeeper/bookkeeper/trunk/hedwig-server/conf/hwenv.sh
Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1601592&r1=1601591&r2=1601592&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Tue Jun 10 10:01:45 2014
@@ -64,6 +64,8 @@ Trunk (unreleased changes)
BOOKKEEPER-767: Allow loopback in tests (ivank via fpj)
+ BOOKKEEPER-765: bookkeeper script should fall back to java in path if
JAVA_HOME is not set (ivank)
+
bookkeeper-server:
BOOKKEEPER-567: ReadOnlyBookieTest hangs on shutdown (sijie via ivank)
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/bin/bookkeeper
URL:
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/bin/bookkeeper?rev=1601592&r1=1601591&r2=1601592&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/bin/bookkeeper (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/bin/bookkeeper Tue Jun 10
10:01:45 2014
@@ -20,13 +20,6 @@
# * limitations under the License.
# */
-# Check for the Java
-if [[ -z $JAVA_HOME ]]; then
- echo "Error: JAVA_HOME is not set" 1>&2
- exit 1
-fi
-JAVA=$JAVA_HOME/bin/java
-
# check if net.ipv6.bindv6only is set to 1
bindv6only=$(/sbin/sysctl -n net.ipv6.bindv6only 2> /dev/null)
if [ -n "$bindv6only" ] && [ "$bindv6only" -eq "1" ]
@@ -64,6 +57,19 @@ DEFAULT_LOG_CONF=$BK_HOME/conf/log4j.pro
source $BK_HOME/conf/bkenv.sh
+# Check for the java to use
+if [[ -z $JAVA_HOME ]]; then
+ JAVA=$(which java)
+ if [ $? = 0 ]; then
+ echo "JAVA_HOME not set, using java from PATH. ($JAVA)"
+ else
+ echo "Error: JAVA_HOME not set, and no java executable found in
$PATH." 1>&2
+ exit 1
+ fi
+else
+ JAVA=$JAVA_HOME/bin/java
+fi
+
# exclude tests jar
RELEASE_JAR=`ls $BK_HOME/bookkeeper-server-*.jar 2> /dev/null | grep -v tests
| tail -1`
if [ $? == 0 ]; then
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/conf/bkenv.sh
URL:
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/conf/bkenv.sh?rev=1601592&r1=1601591&r2=1601592&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/conf/bkenv.sh (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/conf/bkenv.sh Tue Jun 10
10:01:45 2014
@@ -20,6 +20,9 @@
# * limitations under the License.
# */
+# Set JAVA_HOME here to override the environment setting
+# JAVA_HOME=
+
# default settings for starting bookkeeper
# Configuration file of settings used in bookie server
@@ -44,4 +47,4 @@
#BOOKIE_STOP_TIMEOUT=
#Entry formatter class to format entries.
-#ENTRY_FORMATTER_CLASS=
\ No newline at end of file
+#ENTRY_FORMATTER_CLASS=
Modified: zookeeper/bookkeeper/trunk/hedwig-server/bin/hedwig
URL:
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/bin/hedwig?rev=1601592&r1=1601591&r2=1601592&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/bin/hedwig (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/bin/hedwig Tue Jun 10 10:01:45 2014
@@ -58,7 +58,21 @@ DEFAULT_LOG_CONF=$HW_HOME/conf/log4j.pro
. $HW_HOME/conf/hwenv.sh
+# Check for the java to use
+if [[ -z $JAVA_HOME ]]; then
+ JAVA=$(which java)
+ if [ $? = 0 ]; then
+ echo "JAVA_HOME not set, using java from PATH. ($JAVA)"
+ else
+ echo "Error: JAVA_HOME not set, and no java executable found in
$PATH." 1>&2
+ exit 1
+ fi
+else
+ JAVA=$JAVA_HOME/bin/java
+fi
+
RELEASE_JAR=`ls $HW_HOME/hedwig-server-*.jar 2> /dev/null | grep -v tests |
tail -1`
+
if [ $? == 0 ]; then
HEDWIG_JAR=$RELEASE_JAR
fi
@@ -171,7 +185,7 @@ OPTS="$OPTS -Dhedwig.log.file=$HEDWIG_LO
# Change to HW_HOME to support relative paths
cd "$BK_HOME"
if [ $COMMAND == "server" ]; then
- exec java $OPTS $JMX_ARGS org.apache.hedwig.server.netty.PubSubServer
$HEDWIG_SERVER_CONF $HEDWIG_REGION_CLIENT_CONF $@
+ exec $JAVA $OPTS $JMX_ARGS org.apache.hedwig.server.netty.PubSubServer
$HEDWIG_SERVER_CONF $HEDWIG_REGION_CLIENT_CONF $@
elif [ $COMMAND == "console" ]; then
# hedwig console configuration server part
if [ -z "$HEDWIG_CONSOLE_SERVER_CONF" ]; then
@@ -181,11 +195,11 @@ elif [ $COMMAND == "console" ]; then
if [ -n "$HEDWIG_CONSOLE_CLIENT_CONF" ]; then
HEDWIG_CONSOLE_CLIENT_OPTIONS="-client-cfg $HEDWIG_CONSOLE_CLIENT_CONF"
fi
- exec java $OPTS org.apache.hedwig.admin.console.HedwigConsole -server-cfg
$HEDWIG_CONSOLE_SERVER_CONF $HEDWIG_CONSOLE_CLIENT_OPTIONS $@
+ exec $JAVA $OPTS org.apache.hedwig.admin.console.HedwigConsole -server-cfg
$HEDWIG_CONSOLE_SERVER_CONF $HEDWIG_CONSOLE_CLIENT_OPTIONS $@
elif [ $COMMAND == "help" ]; then
hedwig_help;
else
- exec java $OPTS $COMMAND $@
+ exec $JAVA $OPTS $COMMAND $@
fi
Modified: zookeeper/bookkeeper/trunk/hedwig-server/conf/hwenv.sh
URL:
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/conf/hwenv.sh?rev=1601592&r1=1601591&r2=1601592&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/conf/hwenv.sh (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/conf/hwenv.sh Tue Jun 10 10:01:45
2014
@@ -20,6 +20,9 @@
# * limitations under the License.
# */
+# Set JAVA_HOME here to override the environment setting
+# JAVA_HOME=
+
# default settings for starting hedwig
# HEDWIG_SERVER_CONF=
