You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2014/07/11 02:49:02 UTC
[1/5] git commit: HBASE-11496 HBASE-9745 broke cygwin CLASSPATH
translation (Dave Latham)
Repository: hbase
Updated Branches:
refs/heads/0.94 4b2938f19 -> 24f150ebb
refs/heads/0.96 c6abf4f0a -> 0bd53be74
refs/heads/0.98 d09a5cf4e -> 86033abef
refs/heads/branch-1 ec7540229 -> 3d37252a3
refs/heads/master 09fcdb50a -> d289eecd2
HBASE-11496 HBASE-9745 broke cygwin CLASSPATH translation (Dave Latham)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d289eecd
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d289eecd
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d289eecd
Branch: refs/heads/master
Commit: d289eecd2f3694cef8571ded4a065ff00161980d
Parents: 09fcdb5
Author: Andrew Purtell <ap...@apache.org>
Authored: Thu Jul 10 17:47:04 2014 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Thu Jul 10 17:47:04 2014 -0700
----------------------------------------------------------------------
bin/hbase | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/d289eecd/bin/hbase
----------------------------------------------------------------------
diff --git a/bin/hbase b/bin/hbase
index 3ddebf9..721ab5a 100755
--- a/bin/hbase
+++ b/bin/hbase
@@ -188,13 +188,6 @@ if [ "$HBASE_LOGFILE" = "" ]; then
HBASE_LOGFILE='hbase.log'
fi
-# cygwin path translation
-if $cygwin; then
- CLASSPATH=`cygpath -p -w "$CLASSPATH"`
- HBASE_HOME=`cygpath -d "$HBASE_HOME"`
- HBASE_LOG_DIR=`cygpath -d "$HBASE_LOG_DIR"`
-fi
-
function append_path() {
if [ -z "$1" ]; then
echo $2
@@ -216,6 +209,23 @@ if [ -f ${HADOOP_IN_PATH} ]; then
CLASSPATH=$(append_path "${CLASSPATH}" `${HADOOP_IN_PATH} classpath 2>/dev/null`)
fi
+# Add user-specified CLASSPATH last
+if [ "$HBASE_CLASSPATH" != "" ]; then
+ CLASSPATH=${CLASSPATH}:${HBASE_CLASSPATH}
+fi
+
+# Add user-specified CLASSPATH prefix first
+if [ "$HBASE_CLASSPATH_PREFIX" != "" ]; then
+ CLASSPATH=${HBASE_CLASSPATH_PREFIX}:${CLASSPATH}
+fi
+
+# cygwin path translation
+if $cygwin; then
+ CLASSPATH=`cygpath -p -w "$CLASSPATH"`
+ HBASE_HOME=`cygpath -d "$HBASE_HOME"`
+ HBASE_LOG_DIR=`cygpath -d "$HBASE_LOG_DIR"`
+fi
+
if [ -d "${HBASE_HOME}/build/native" -o -d "${HBASE_HOME}/lib/native" ]; then
if [ -z $JAVA_PLATFORM ]; then
JAVA_PLATFORM=`CLASSPATH=${CLASSPATH} ${JAVA} org.apache.hadoop.util.PlatformName | sed -e "s/ /_/g"`
@@ -229,16 +239,6 @@ if [ -d "${HBASE_HOME}/build/native" -o -d "${HBASE_HOME}/lib/native" ]; then
fi
fi
-# Add user-specified CLASSPATH last
-if [ "$HBASE_CLASSPATH" != "" ]; then
- CLASSPATH=${CLASSPATH}:${HBASE_CLASSPATH}
-fi
-
-# Add user-specified CLASSPATH prefix first
-if [ "$HBASE_CLASSPATH_PREFIX" != "" ]; then
- CLASSPATH=${HBASE_CLASSPATH_PREFIX}:${CLASSPATH}
-fi
-
# cygwin path translation
if $cygwin; then
JAVA_LIBRARY_PATH=`cygpath -p "$JAVA_LIBRARY_PATH"`
[5/5] git commit: HBASE-11496 HBASE-9745 broke cygwin CLASSPATH
translation (Dave Latham)
Posted by ap...@apache.org.
HBASE-11496 HBASE-9745 broke cygwin CLASSPATH translation (Dave Latham)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/3d37252a
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3d37252a
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3d37252a
Branch: refs/heads/branch-1
Commit: 3d37252a3296f9c93c93a56e5aa1ecd557df5a6c
Parents: ec75402
Author: Andrew Purtell <ap...@apache.org>
Authored: Thu Jul 10 17:47:04 2014 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Thu Jul 10 17:48:02 2014 -0700
----------------------------------------------------------------------
bin/hbase | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/3d37252a/bin/hbase
----------------------------------------------------------------------
diff --git a/bin/hbase b/bin/hbase
index 3ddebf9..721ab5a 100755
--- a/bin/hbase
+++ b/bin/hbase
@@ -188,13 +188,6 @@ if [ "$HBASE_LOGFILE" = "" ]; then
HBASE_LOGFILE='hbase.log'
fi
-# cygwin path translation
-if $cygwin; then
- CLASSPATH=`cygpath -p -w "$CLASSPATH"`
- HBASE_HOME=`cygpath -d "$HBASE_HOME"`
- HBASE_LOG_DIR=`cygpath -d "$HBASE_LOG_DIR"`
-fi
-
function append_path() {
if [ -z "$1" ]; then
echo $2
@@ -216,6 +209,23 @@ if [ -f ${HADOOP_IN_PATH} ]; then
CLASSPATH=$(append_path "${CLASSPATH}" `${HADOOP_IN_PATH} classpath 2>/dev/null`)
fi
+# Add user-specified CLASSPATH last
+if [ "$HBASE_CLASSPATH" != "" ]; then
+ CLASSPATH=${CLASSPATH}:${HBASE_CLASSPATH}
+fi
+
+# Add user-specified CLASSPATH prefix first
+if [ "$HBASE_CLASSPATH_PREFIX" != "" ]; then
+ CLASSPATH=${HBASE_CLASSPATH_PREFIX}:${CLASSPATH}
+fi
+
+# cygwin path translation
+if $cygwin; then
+ CLASSPATH=`cygpath -p -w "$CLASSPATH"`
+ HBASE_HOME=`cygpath -d "$HBASE_HOME"`
+ HBASE_LOG_DIR=`cygpath -d "$HBASE_LOG_DIR"`
+fi
+
if [ -d "${HBASE_HOME}/build/native" -o -d "${HBASE_HOME}/lib/native" ]; then
if [ -z $JAVA_PLATFORM ]; then
JAVA_PLATFORM=`CLASSPATH=${CLASSPATH} ${JAVA} org.apache.hadoop.util.PlatformName | sed -e "s/ /_/g"`
@@ -229,16 +239,6 @@ if [ -d "${HBASE_HOME}/build/native" -o -d "${HBASE_HOME}/lib/native" ]; then
fi
fi
-# Add user-specified CLASSPATH last
-if [ "$HBASE_CLASSPATH" != "" ]; then
- CLASSPATH=${CLASSPATH}:${HBASE_CLASSPATH}
-fi
-
-# Add user-specified CLASSPATH prefix first
-if [ "$HBASE_CLASSPATH_PREFIX" != "" ]; then
- CLASSPATH=${HBASE_CLASSPATH_PREFIX}:${CLASSPATH}
-fi
-
# cygwin path translation
if $cygwin; then
JAVA_LIBRARY_PATH=`cygpath -p "$JAVA_LIBRARY_PATH"`
[4/5] git commit: HBASE-11496 HBASE-9745 broke cygwin CLASSPATH
translation (Dave Latham)
Posted by ap...@apache.org.
HBASE-11496 HBASE-9745 broke cygwin CLASSPATH translation (Dave Latham)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/24f150eb
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/24f150eb
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/24f150eb
Branch: refs/heads/0.94
Commit: 24f150ebbc132baf99022cbdd1b28fa7842522f7
Parents: 4b2938f
Author: Andrew Purtell <ap...@apache.org>
Authored: Thu Jul 10 17:47:04 2014 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Thu Jul 10 17:47:43 2014 -0700
----------------------------------------------------------------------
bin/hbase | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/24f150eb/bin/hbase
----------------------------------------------------------------------
diff --git a/bin/hbase b/bin/hbase
index adf4dae..ec6c23c 100755
--- a/bin/hbase
+++ b/bin/hbase
@@ -198,13 +198,6 @@ if [ "$HBASE_LOGFILE" = "" ]; then
HBASE_LOGFILE='hbase.log'
fi
-# cygwin path translation
-if $cygwin; then
- CLASSPATH=`cygpath -p -w "$CLASSPATH"`
- HBASE_HOME=`cygpath -d "$HBASE_HOME"`
- HBASE_LOG_DIR=`cygpath -d "$HBASE_LOG_DIR"`
-fi
-
function append_path() {
if [ -z "$1" ]; then
echo $2
@@ -226,6 +219,23 @@ if [ -f ${HADOOP_IN_PATH} ]; then
CLASSPATH=$(append_path "${CLASSPATH}" `${HADOOP_IN_PATH} classpath 2>/dev/null`)
fi
+# Add user-specified CLASSPATH last
+if [ "$HBASE_CLASSPATH" != "" ]; then
+ CLASSPATH=${CLASSPATH}:${HBASE_CLASSPATH}
+fi
+
+# Add user-specified CLASSPATH prefix first
+if [ "$HBASE_CLASSPATH_PREFIX" != "" ]; then
+ CLASSPATH=${HBASE_CLASSPATH_PREFIX}:${CLASSPATH}
+fi
+
+# cygwin path translation
+if $cygwin; then
+ CLASSPATH=`cygpath -p -w "$CLASSPATH"`
+ HBASE_HOME=`cygpath -d "$HBASE_HOME"`
+ HBASE_LOG_DIR=`cygpath -d "$HBASE_LOG_DIR"`
+fi
+
if [ -d "${HBASE_HOME}/build/native" -o -d "${HBASE_HOME}/lib/native" ]; then
if [ -z $JAVA_PLATFORM ]; then
JAVA_PLATFORM=`CLASSPATH=${CLASSPATH} ${JAVA} org.apache.hadoop.util.PlatformName | sed -e "s/ /_/g"`
@@ -239,16 +249,6 @@ if [ -d "${HBASE_HOME}/build/native" -o -d "${HBASE_HOME}/lib/native" ]; then
fi
fi
-# Add user-specified CLASSPATH last
-if [ "$HBASE_CLASSPATH" != "" ]; then
- CLASSPATH=${CLASSPATH}:${HBASE_CLASSPATH}
-fi
-
-# Add user-specified CLASSPATH prefix first
-if [ "$HBASE_CLASSPATH_PREFIX" != "" ]; then
- CLASSPATH=${HBASE_CLASSPATH_PREFIX}:${CLASSPATH}
-fi
-
# cygwin path translation
if $cygwin; then
JAVA_LIBRARY_PATH=`cygpath -p "$JAVA_LIBRARY_PATH"`
[2/5] git commit: HBASE-11496 HBASE-9745 broke cygwin CLASSPATH
translation (Dave Latham)
Posted by ap...@apache.org.
HBASE-11496 HBASE-9745 broke cygwin CLASSPATH translation (Dave Latham)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/86033abe
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/86033abe
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/86033abe
Branch: refs/heads/0.98
Commit: 86033abef298b4ff3397dac732ad1ab22fc22376
Parents: d09a5cf
Author: Andrew Purtell <ap...@apache.org>
Authored: Thu Jul 10 17:47:04 2014 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Thu Jul 10 17:47:23 2014 -0700
----------------------------------------------------------------------
bin/hbase | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/86033abe/bin/hbase
----------------------------------------------------------------------
diff --git a/bin/hbase b/bin/hbase
index 3ddebf9..721ab5a 100755
--- a/bin/hbase
+++ b/bin/hbase
@@ -188,13 +188,6 @@ if [ "$HBASE_LOGFILE" = "" ]; then
HBASE_LOGFILE='hbase.log'
fi
-# cygwin path translation
-if $cygwin; then
- CLASSPATH=`cygpath -p -w "$CLASSPATH"`
- HBASE_HOME=`cygpath -d "$HBASE_HOME"`
- HBASE_LOG_DIR=`cygpath -d "$HBASE_LOG_DIR"`
-fi
-
function append_path() {
if [ -z "$1" ]; then
echo $2
@@ -216,6 +209,23 @@ if [ -f ${HADOOP_IN_PATH} ]; then
CLASSPATH=$(append_path "${CLASSPATH}" `${HADOOP_IN_PATH} classpath 2>/dev/null`)
fi
+# Add user-specified CLASSPATH last
+if [ "$HBASE_CLASSPATH" != "" ]; then
+ CLASSPATH=${CLASSPATH}:${HBASE_CLASSPATH}
+fi
+
+# Add user-specified CLASSPATH prefix first
+if [ "$HBASE_CLASSPATH_PREFIX" != "" ]; then
+ CLASSPATH=${HBASE_CLASSPATH_PREFIX}:${CLASSPATH}
+fi
+
+# cygwin path translation
+if $cygwin; then
+ CLASSPATH=`cygpath -p -w "$CLASSPATH"`
+ HBASE_HOME=`cygpath -d "$HBASE_HOME"`
+ HBASE_LOG_DIR=`cygpath -d "$HBASE_LOG_DIR"`
+fi
+
if [ -d "${HBASE_HOME}/build/native" -o -d "${HBASE_HOME}/lib/native" ]; then
if [ -z $JAVA_PLATFORM ]; then
JAVA_PLATFORM=`CLASSPATH=${CLASSPATH} ${JAVA} org.apache.hadoop.util.PlatformName | sed -e "s/ /_/g"`
@@ -229,16 +239,6 @@ if [ -d "${HBASE_HOME}/build/native" -o -d "${HBASE_HOME}/lib/native" ]; then
fi
fi
-# Add user-specified CLASSPATH last
-if [ "$HBASE_CLASSPATH" != "" ]; then
- CLASSPATH=${CLASSPATH}:${HBASE_CLASSPATH}
-fi
-
-# Add user-specified CLASSPATH prefix first
-if [ "$HBASE_CLASSPATH_PREFIX" != "" ]; then
- CLASSPATH=${HBASE_CLASSPATH_PREFIX}:${CLASSPATH}
-fi
-
# cygwin path translation
if $cygwin; then
JAVA_LIBRARY_PATH=`cygpath -p "$JAVA_LIBRARY_PATH"`
[3/5] git commit: HBASE-11496 HBASE-9745 broke cygwin CLASSPATH
translation (Dave Latham)
Posted by ap...@apache.org.
HBASE-11496 HBASE-9745 broke cygwin CLASSPATH translation (Dave Latham)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0bd53be7
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0bd53be7
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0bd53be7
Branch: refs/heads/0.96
Commit: 0bd53be747986e398b8402848b2ff5dff2ea2495
Parents: c6abf4f
Author: Andrew Purtell <ap...@apache.org>
Authored: Thu Jul 10 17:47:04 2014 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Thu Jul 10 17:47:32 2014 -0700
----------------------------------------------------------------------
bin/hbase | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/0bd53be7/bin/hbase
----------------------------------------------------------------------
diff --git a/bin/hbase b/bin/hbase
index 36761c4..37e2d7b 100755
--- a/bin/hbase
+++ b/bin/hbase
@@ -181,13 +181,6 @@ if [ "$HBASE_LOGFILE" = "" ]; then
HBASE_LOGFILE='hbase.log'
fi
-# cygwin path translation
-if $cygwin; then
- CLASSPATH=`cygpath -p -w "$CLASSPATH"`
- HBASE_HOME=`cygpath -d "$HBASE_HOME"`
- HBASE_LOG_DIR=`cygpath -d "$HBASE_LOG_DIR"`
-fi
-
function append_path() {
if [ -z "$1" ]; then
echo $2
@@ -209,6 +202,23 @@ if [ -f ${HADOOP_IN_PATH} ]; then
CLASSPATH=$(append_path "${CLASSPATH}" `${HADOOP_IN_PATH} classpath 2>/dev/null`)
fi
+# Add user-specified CLASSPATH last
+if [ "$HBASE_CLASSPATH" != "" ]; then
+ CLASSPATH=${CLASSPATH}:${HBASE_CLASSPATH}
+fi
+
+# Add user-specified CLASSPATH prefix first
+if [ "$HBASE_CLASSPATH_PREFIX" != "" ]; then
+ CLASSPATH=${HBASE_CLASSPATH_PREFIX}:${CLASSPATH}
+fi
+
+# cygwin path translation
+if $cygwin; then
+ CLASSPATH=`cygpath -p -w "$CLASSPATH"`
+ HBASE_HOME=`cygpath -d "$HBASE_HOME"`
+ HBASE_LOG_DIR=`cygpath -d "$HBASE_LOG_DIR"`
+fi
+
if [ -d "${HBASE_HOME}/build/native" -o -d "${HBASE_HOME}/lib/native" ]; then
if [ -z $JAVA_PLATFORM ]; then
JAVA_PLATFORM=`CLASSPATH=${CLASSPATH} ${JAVA} org.apache.hadoop.util.PlatformName | sed -e "s/ /_/g"`
@@ -222,16 +232,6 @@ if [ -d "${HBASE_HOME}/build/native" -o -d "${HBASE_HOME}/lib/native" ]; then
fi
fi
-# Add user-specified CLASSPATH last
-if [ "$HBASE_CLASSPATH" != "" ]; then
- CLASSPATH=${CLASSPATH}:${HBASE_CLASSPATH}
-fi
-
-# Add user-specified CLASSPATH prefix first
-if [ "$HBASE_CLASSPATH_PREFIX" != "" ]; then
- CLASSPATH=${HBASE_CLASSPATH_PREFIX}:${CLASSPATH}
-fi
-
# cygwin path translation
if $cygwin; then
JAVA_LIBRARY_PATH=`cygpath -p "$JAVA_LIBRARY_PATH"`