ZOOKEEPER-210, Require Java 6.

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

CHANGES.txt

@@ -108,6 +108,8 @@ IMPROVEMENTS:
    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:

bin/zkServer.sh

@@ -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 @@ case $1 in
 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) 

build.xml

@@ -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" />

src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml

@@ -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 @@ server.3=zoo3:2888:3888</computeroutput></para>
           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>