svn commit: r902260 - in /incubator/cassandra/trunk/bin: nodeprobe nodetool

[ee...@apache.org]

Author: eevans
Date: Fri Jan 22 20:38:33 2010
New Revision: 902260

URL: http://svn.apache.org/viewvc?rev=902260&view=rev
Log:
rename nodeprobe -> nodetool

Get away from the one-to-one correlation with the NodeProbe class; be
more consistent with the new clustertool.

Patch by eevans

Added:
    incubator/cassandra/trunk/bin/nodetool
      - copied, changed from r902250, incubator/cassandra/trunk/bin/nodeprobe
Modified:
    incubator/cassandra/trunk/bin/nodeprobe   (contents, props changed)

Modified: incubator/cassandra/trunk/bin/nodeprobe
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/bin/nodeprobe?rev=902260&r1=902259&r2=902260&view=diff
==============================================================================
--- incubator/cassandra/trunk/bin/nodeprobe (original)
+++ incubator/cassandra/trunk/bin/nodeprobe Fri Jan 22 20:38:33 2010
@@ -1,56 +1 @@
-#!/bin/sh
-# 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.
-
-
-if [ "x$CASSANDRA_INCLUDE" = "x" ]; then
-    for include in /usr/share/cassandra/cassandra.in.sh \
-                   /usr/local/share/cassandra/cassandra.in.sh \
-                   /opt/cassandra/cassandra.in.sh \
-                   `dirname $0`/cassandra.in.sh; do
-        if [ -r $include ]; then
-            . $include
-            break
-        fi
-    done
-elif [ -r $CASSANDRA_INCLUDE ]; then
-    . $CASSANDRA_INCLUDE
-fi
-
-# Use JAVA_HOME if set, otherwise look for java in PATH
-if [ -x $JAVA_HOME/bin/java ]; then
-    JAVA=$JAVA_HOME/bin/java
-else
-    JAVA=`which java`
-fi
-
-if [ -z $CASSANDRA_CONF -o -z $CLASSPATH ]; then
-    echo "You must set the CASSANDRA_CONF and CLASSPATH vars" >&2
-    exit 1
-fi
-
-# Special-case path variables.
-case "`uname`" in
-    CYGWIN*) 
-        CLASSPATH=`cygpath -p -w "$CLASSPATH"`
-        CASSANDRA_CONF=`cygpath -p -w "$CASSANDRA_CONF"`
-    ;;
-esac
-
-$JAVA -cp $CLASSPATH -Dstorage-config=$CASSANDRA_CONF \
-        org.apache.cassandra.tools.NodeCmd $@
-
-# vi:ai sw=4 ts=4 tw=0 et
+link nodetool
\ No newline at end of file

Propchange: incubator/cassandra/trunk/bin/nodeprobe
            ('svn:executable' removed)

Propchange: incubator/cassandra/trunk/bin/nodeprobe
------------------------------------------------------------------------------
    svn:special = *

Copied: incubator/cassandra/trunk/bin/nodetool (from r902250, incubator/cassandra/trunk/bin/nodeprobe)
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/bin/nodetool?p2=incubator/cassandra/trunk/bin/nodetool&p1=incubator/cassandra/trunk/bin/nodeprobe&r1=902250&r2=902260&rev=902260&view=diff
==============================================================================
--- incubator/cassandra/trunk/bin/nodeprobe (original)
+++ incubator/cassandra/trunk/bin/nodetool Fri Jan 22 20:38:33 2010
@@ -15,6 +15,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+if [ `basename $0` = 'nodeprobe' ]; then
+    echo "***************************************************************" >&2
+    echo "WARNING: $0 is obsolete, use `dirname $0`/nodetool instead" >&2
+    echo "***************************************************************" >&2
+fi
 
 if [ "x$CASSANDRA_INCLUDE" = "x" ]; then
     for include in /usr/share/cassandra/cassandra.in.sh \