Return-Path: X-Original-To: apmail-incubator-accumulo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-accumulo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 84392971F for ; Wed, 19 Oct 2011 18:49:15 +0000 (UTC) Received: (qmail 61732 invoked by uid 500); 19 Oct 2011 18:49:15 -0000 Delivered-To: apmail-incubator-accumulo-commits-archive@incubator.apache.org Received: (qmail 61711 invoked by uid 500); 19 Oct 2011 18:49:15 -0000 Mailing-List: contact accumulo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: accumulo-dev@incubator.apache.org Delivered-To: mailing list accumulo-commits@incubator.apache.org Received: (qmail 61704 invoked by uid 99); 19 Oct 2011 18:49:15 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Oct 2011 18:49:15 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Oct 2011 18:49:13 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2208D2388847; Wed, 19 Oct 2011 18:48:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1186393 - in /incubator/accumulo/trunk: bin/tool.sh test/system/auto/simple/mapreduce.py Date: Wed, 19 Oct 2011 18:48:52 -0000 To: accumulo-commits@incubator.apache.org From: billie@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111019184852.2208D2388847@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: billie Date: Wed Oct 19 18:48:51 2011 New Revision: 1186393 URL: http://svn.apache.org/viewvc?rev=1186393&view=rev Log: ACCUMULO-46 fixed globbing for zookeeper jar when multiple jars are present Modified: incubator/accumulo/trunk/bin/tool.sh incubator/accumulo/trunk/test/system/auto/simple/mapreduce.py Modified: incubator/accumulo/trunk/bin/tool.sh URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/bin/tool.sh?rev=1186393&r1=1186392&r2=1186393&view=diff ============================================================================== --- incubator/accumulo/trunk/bin/tool.sh (original) +++ incubator/accumulo/trunk/bin/tool.sh Wed Oct 19 18:48:51 2011 @@ -31,7 +31,7 @@ fi LIB=$ACCUMULO_HOME/lib -ZOOKEEPER_CMD='ls -1 $ZOOKEEPER_HOME/*.jar' +ZOOKEEPER_CMD='ls -1 $ZOOKEEPER_HOME/*.jar | grep -v -e ".*javadoc.jar$" | grep -v -e ".*src.jar$" | grep -v -e ".*bin.jar$"' CORE_CMD='ls -1 $LIB/accumulo-core-*.jar | grep -v -e ".*javadoc.jar$" | grep -v -e ".*sources.jar$"' THRIFT_CMD='ls -1 $LIB/libthrift-*.jar | grep -v -e ".*javadoc.jar$" | grep -v -e ".*sources.jar$"' CLOUDTRACE_CMD='ls -1 $LIB/cloudtrace-*.jar | grep -v -e ".*javadoc.jar$" | grep -v -e ".*sources.jar$"' Modified: incubator/accumulo/trunk/test/system/auto/simple/mapreduce.py URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/mapreduce.py?rev=1186393&r1=1186392&r2=1186393&view=diff ============================================================================== --- incubator/accumulo/trunk/test/system/auto/simple/mapreduce.py (original) +++ incubator/accumulo/trunk/test/system/auto/simple/mapreduce.py Wed Oct 19 18:48:51 2011 @@ -70,7 +70,7 @@ class MapReduceTest(TestUtilsMixin,unitt core = globa(os.path.join('lib','accumulo-core*[!javadoc|sources].jar')) start = globa(os.path.join('lib','accumulo-start*[!javadoc|sources].jar')) trace = globa(os.path.join('lib','cloudtrace*[!javadoc|sources].jar')) - zkjar = globbase(os.getenv("ZOOKEEPER_HOME"),"zookeeper*.jar") + zkjar = globbase(os.getenv("ZOOKEEPER_HOME"),"zookeeper*[!javadoc|src|bin].jar") self.createInputTableInAccumulo(); #Arguments for the Example Class arg_list = [TestUtils.INSTANCE_NAME,