Author: breed
Date: Thu Jan 22 07:29:11 2009
New Revision: 736673
URL: http://svn.apache.org/viewvc?rev=736673&view=rev
Log:
ZOOKEEPER-210, Require Java 6.
Modified:
hadoop/zookeeper/trunk/CHANGES.txt
hadoop/zookeeper/trunk/bin/zkServer.sh
hadoop/zookeeper/trunk/build.xml
hadoop/zookeeper/trunk/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml
Modified: hadoop/zookeeper/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/CHANGES.txt?rev=736673&r1=736672&r2=736673&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/CHANGES.txt (original)
+++ hadoop/zookeeper/trunk/CHANGES.txt Thu Jan 22 07:29:11 2009
@@ -108,6 +108,8 @@
ZOOKEEPER-259. cleanup the logging levels used (use the correct level)
and messages generated. (phunt via breed)
+ ZOOKEEPER-210. Require Java 6. (phunt via breed)
+
Release 3.0.0 - 2008-10-21
Non-backward compatible changes:
Modified: hadoop/zookeeper/trunk/bin/zkServer.sh
URL:
http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/bin/zkServer.sh?rev=736673&r1=736672&r2=736673&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/bin/zkServer.sh (original)
+++ hadoop/zookeeper/trunk/bin/zkServer.sh Thu Jan 22 07:29:11 2009
@@ -21,6 +21,13 @@
# relative to the canonical path of this script.
#
+# by default we allow non-local JMX connection
+# set this to true if you wish to allow only local connections
+if [ "x$JMXLOCALONLY" = "x" ]
+then
+ JMXLOCALONLY=false
+fi
+
ZOOBIN=`readlink -f "$0"`
ZOOBINDIR=`dirname "$ZOOBIN"`
@@ -30,7 +37,7 @@
start)
echo -n "Starting zookeeper ... "
java "-Dzookeeper.log.dir=${ZOO_LOG_DIR}"
"-Dzookeeper.root.logger=${ZOO_LOG4J_PROP}" \
- -cp $CLASSPATH $JVMFLAGS org.apache.zookeeper.server.quorum.QuorumPeerMain
$ZOOCFG &
+ -cp $CLASSPATH -Dcom.sun.management.jmxremote
-Dcom.sun.management.jmxremote.local.only=$JMXLOCALONLY $JVMFLAGS
org.apache.zookeeper.server.quorum.ManagedQuorumPeerMain $ZOOCFG &
echo STARTED
;;
stop)
Modified: hadoop/zookeeper/trunk/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/build.xml?rev=736673&r1=736672&r2=736673&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/build.xml (original)
+++ hadoop/zookeeper/trunk/build.xml Thu Jan 22 07:29:11 2009
@@ -67,7 +67,7 @@
<property name="docs.dir" value="${basedir}/docs"/>
<property name="docs.src" value="${basedir}/src/docs"/>
<property name="javadoc.link.java"
- value="http://java.sun.com/j2se/1.5/docs/api/"; />
+ value="http://java.sun.com/javase/6/docs/api/"; />
<property name="javadoc.packages" value="org.apache.*" />
<property name="build.docs" value="${build.dir}/docs" />
Modified:
hadoop/zookeeper/trunk/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml
URL:
http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml?rev=736673&r1=736672&r2=736673&view=diff
==============================================================================
---
hadoop/zookeeper/trunk/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml
(original)
+++
hadoop/zookeeper/trunk/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml
Thu Jan 22 07:29:11 2009
@@ -102,7 +102,7 @@
<section id="sc_requiredSoftware">
<title>Required Software </title>
- <para>ZooKeeper runs in Java, release 1.5 or greater (JDK 5 or
+ <para>ZooKeeper runs in Java, release 1.6 or greater (JDK 6 or
greater). It runs as an <emphasis>ensemble</emphasis> of
ZooKeeper servers. Three ZooKeeper servers is the minimum
recommended size for an ensemble, and we also recommend that
@@ -197,7 +197,7 @@
ZooKeeper:</para>
<para><computeroutput>$ java -cp
zookeeper.jar:src/java/lib/log4j-1.2.15.jar:conf \
- org.apache.zookeeper.server.quorum.QuorumPeerMain
zoo.cfg</computeroutput></para>
+ org.apache.zookeeper.server.quorum.ManagedQuorumPeerMain
zoo.cfg</computeroutput></para>
</listitem>
<listitem>
