svn commit: r1186393 - in /incubator/accumulo/trunk: bin/tool.sh test/system/auto/simple/mapreduce.py

[bi...@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,