Author: gkesavan
Date: Mon Jul 27 06:42:56 2009
New Revision: 798038

URL: http://svn.apache.org/viewvc?rev=798038&view=rev
Log:
ZOOKEEPER-488. Fix zkServer.sh to add clover.jar in classpath (contributed by 
Giridharan Kesavan)

Modified:
    hadoop/zookeeper/trunk/CHANGES.txt
    hadoop/zookeeper/trunk/build.xml
    hadoop/zookeeper/trunk/src/c/tests/zkServer.sh

Modified: hadoop/zookeeper/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/CHANGES.txt?rev=798038&r1=798037&r2=798038&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/CHANGES.txt (original)
+++ hadoop/zookeeper/trunk/CHANGES.txt Mon Jul 27 06:42:56 2009
@@ -20,6 +20,9 @@
 IMPROVEMENTS:
   ZOOKEEPER-473. cleanup junit tests to eliminate false positives due to
 "socket reuse" and failure to close client (phunt via mahadev)
+ 
+  ZOOKEEPER-488. Fix zkServer.sh to add clover.jar in classpath
+  (Giridharan Kesavan via gkesavan)  
 
 NEW FEATURES:
 

Modified: hadoop/zookeeper/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/build.xml?rev=798038&r1=798037&r2=798038&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/build.xml (original)
+++ hadoop/zookeeper/trunk/build.xml Mon Jul 27 06:42:56 2009
@@ -704,7 +704,7 @@
                <env key="LD_LIBRARY_PATH" value="${lib.cppunit}"/>
                <env key="PATH" path="${env.PATH};${c.src.dir};"/>
                 <env key="CALLER" value="ANT"/>
-                <env key="CLOVER_HOME" value="{clover.home}"/>
+                <env key="CLOVER_HOME" value="${clover.home}"/>
                 <env key="base_dir" value="${basedir}"/>
                <arg line="clean run-check"/>
        </exec>

Modified: hadoop/zookeeper/trunk/src/c/tests/zkServer.sh
URL: 
http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/c/tests/zkServer.sh?rev=798038&r1=798037&r2=798038&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/src/c/tests/zkServer.sh (original)
+++ hadoop/zookeeper/trunk/src/c/tests/zkServer.sh Mon Jul 27 06:42:56 2009
@@ -53,12 +53,12 @@
        if [ "x${base_dir}" == "x" ]
         then
        mkdir -p /tmp/zkdata
-        java -cp ../../zookeeper-dev.jar:../../src/java/lib/log4j-1.2.15.jar 
org.apache.zookeeper.server.ZooKeeperServerMain 22181 /tmp/zkdata 3000 
$ZKMAXCNXNS &> /tmp/zk.log &
+        java -cp 
../../zookeeper-dev.jar:../../src/java/lib/log4j-1.2.15.jar:${CLOVER_HOME}/lib/clover.jar
 org.apache.zookeeper.server.ZooKeeperServerMain 22181 /tmp/zkdata 3000 
$ZKMAXCNXNS &> /tmp/zk.log &
         pid=$!
         echo $! > /tmp/zk.pid        
         else
         mkdir -p ${base_dir}/build/tmp/zkdata
-        java -cp 
${base_dir}/zookeeper-dev.jar:${base_dir}/src/java/lib/log4j-1.2.15.jar:${base_dir}/conf
 org.apache.zookeeper.server.ZooKeeperServerMain 22181 
${base_dir}/build/tmp/zkdata 3000 $ZKMAXCNXNS &> ${base_dir}/build/tmp/zk.log &
+        java -cp 
${base_dir}/zookeeper-dev.jar:${base_dir}/src/java/lib/log4j-1.2.15.jar:${base_dir}/conf:${CLOVER_HOME}/lib/clover.jar
 org.apache.zookeeper.server.ZooKeeperServerMain 22181 
${base_dir}/build/tmp/zkdata 3000 $ZKMAXCNXNS &> ${base_dir}/build/tmp/zk.log &
         echo $! > ${base_dir}/build/tmp/zk.pid
        fi
         sleep 5


Reply via email to