ZOOKEEPER-1012. support distinct JVMFLAGS for zookeeper server in zkServer.sh and zookeeper client in zkCli.sh

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1082221 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -190,6 +190,8 @@ BUGFIXES:
 
   ZOOKEEPER-993. Code improvements (MIS via fpj)
 
+  ZOOKEEPER-1012. support distinct JVMFLAGS for zookeeper server in zkServer.sh and zookeeper client in zkCli.sh (Eugene Koontz via breed)
+
 IMPROVEMENTS:
   ZOOKEEPER-724. Improve junit test integration - log harness information 
   (phunt via mahadev)

bin/zkCli.sh

@@ -37,5 +37,5 @@ ZOOBINDIR=`dirname "$ZOOBIN"`
 . "$ZOOBINDIR"/zkEnv.sh
 
 $JAVA "-Dzookeeper.log.dir=${ZOO_LOG_DIR}" "-Dzookeeper.root.logger=${ZOO_LOG4J_PROP}" \
-     -cp "$CLASSPATH" $JVMFLAGS \
+     -cp "$CLASSPATH" $CLIENT_JVMFLAGS $JVMFLAGS \
      org.apache.zookeeper.ZooKeeperMain $@

bin/zkServer.sh

@@ -53,6 +53,11 @@ ZOOBINDIR=`dirname "$ZOOBIN"`
 
 . "$ZOOBINDIR"/zkEnv.sh
 
+if [ "x$SERVER_JVMFLAGS" ]
+then
+    JVMFLAGS="$SERVER_JVMFLAGS $JVMFLAGS"
+fi
+
 if [ "x$2" != "x" ]
 then
     ZOOCFG="$ZOOCFGDIR/$2"