Ticket #26872: rollup.patch

java/zookeeper-server/Portfile

@@ +1 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# $Id: Portfile 72252 2010-10-08 23:20:28Z jberry@macports.org $
+
+PortSystem      1.0
+
+name            zookeeper-server
+version         3.3.1
+revision        1
+
+categories      java
+maintainers     ikami.com:nrh
+platforms       darwin
+
+description     ZooKeeper: Because coordinating distributed systems is a Zoo
+
+long_description \
+    ZooKeeper allows distributed processes to coordinate with each other \
+    through a shared hierarchal name space of data registers (we call \
+    these registers znodes), much like a file system. Unlike normal file \
+    systems ZooKeeper provides its clients with high throughput, low \
+    latency, highly available, strictly ordered access to the znodes. \
+    The performance aspects of ZooKeeper allows it to be used in large \
+    distributed systems. The reliability aspects prevent it from \
+    becoming the single point of failure in big systems. Its strict \
+    ordering allows sophisticated synchronization primitives to be \
+    implemented at the client.
+
+homepage        http://hadoop.apache.org/zookeeper/
+
+master_sites    apache:hadoop/zookeeper/zookeeper-${version}/
+checksums       md5 bdcd73634e3f6623a025854f853c3d0d \
+                sha1 683f439c149fdeaad996eb88d84caa2f2fc756c5
+
+distname        zookeeper-${version}
+
+depends_build   bin:ant:apache-ant
+
+use_configure       no
+build.cmd           ant
+build.target-delete all
+test.run            yes
+patchfiles          zkServer.sh.patch zoo.cfg.patch
+
+destroot {
+    xinstall -m 755 -d ${destroot}${prefix}/share/java/${name}
+    file copy ${worksrcpath}/zookeeper-${version}.jar \
+        ${destroot}${prefix}/share/java/${name}
+    file copy \
+        ${worksrcpath}/lib \
+        ${worksrcpath}/bin \
+        ${worksrcpath}/conf \
+        ${worksrcpath}/docs \
+        ${destroot}${prefix}/share/java/${name}
+
+    ln -sf ${prefix}/share/java/${name}/bin/zkServer.sh \
+        ${destroot}${prefix}/bin/zookeeper-server.sh
+}
+
+startupitem.create      yes
+startupitem.executable  "${prefix}/bin/zookeeper-server.sh" start-foreground
+
+

java/zookeeper-server/files/zkServer.sh.patch

@@ +1 @@
+--- ../zookeeper-3.3.1.orig/bin/zkServer.sh     2010-05-07 13:15:35.000000000 -0400
++++ bin/zkServer.sh     2010-10-17 18:28:07.000000000 -0400
+@@ -32,20 +32,28 @@
+ 
+ if [ "x$JMXDISABLE" = "x" ]
+ then
+-    echo "JMX enabled by default"
++    echo "JMX enabled by default" >&2
+     # for some reason these two options are necessary on jdk6 on Ubuntu
+     #   accord to the docs they are not necessary, but otw jconsole cannot
+     #   do a local attach
+     ZOOMAIN="-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.local.only=$JMXLOCALONLY org.apache.zookeeper.server.quorum.QuorumPeerMain"
+ else
+-    echo "JMX disabled by user request"
++    echo "JMX disabled by user request" >&2
+     ZOOMAIN="org.apache.zookeeper.server.quorum.QuorumPeerMain"
+ fi
+ 
+ # Only follow symlinks if readlink supports it
++# macos's readlink doesn't have -f
+ if readlink -f "$0" > /dev/null 2>&1
+ then
+-  ZOOBIN=`readlink -f "$0"`
++  READLINK="readlink -f"
++else
++  READLINK="readlink"
++fi
++
++if $READLINK "$0" > /dev/null 2>&1
++then
++  ZOOBIN=`$READLINK "$0"`
+ else
+   ZOOBIN="$0"
+ fi
+@@ -58,6 +66,16 @@
+     ZOOCFG="$ZOOCFGDIR/$2"
+ fi
+ 
++# if we're given a more complicated path to the config
++# don't assume it lives in $ZOOCFGDIR, just use it
++if [ ! -z "$2" ]
++then
++  if [ "`basename $2`" != "$2" ]
++  then
++    ZOOCFG="$2"
++  fi
++fi
++
+ if $cygwin
+ then
+     ZOOCFG=`cygpath -wp "$ZOOCFG"`
+@@ -67,7 +85,7 @@
+     KILL=kill
+ fi
+ 
+-echo "Using config: $ZOOCFG"
++echo "Using config: $ZOOCFG" >&2
+ 
+ ZOOPIDFILE=$(grep dataDir "$ZOOCFG" | sed -e 's/.*=//')/zookeeper_server.pid
+ 
+@@ -80,6 +98,13 @@
+     /bin/echo -n $! > "$ZOOPIDFILE"
+     echo STARTED
+     ;;
++start-foreground)
++    java  "-Dzookeeper.log.dir=${ZOO_LOG_DIR}" "-Dzookeeper.root.logger=${ZOO_LOG4J_PROP}" \
++    -cp "$CLASSPATH" $JVMFLAGS $ZOOMAIN "$ZOOCFG"
++    ;;
++print-cmd)
++    echo "java -Dzookeeper.log.dir=\"${ZOO_LOG_DIR}\" -Dzookeeper.root.logger=\"${ZOO_LOG4J_PROP}\" -cp \"$CLASSPATH\" $JVMFLAGS $ZOOMAIN \"$ZOOCFG\""
++    ;;
+ stop)
+     echo "Stopping zookeeper ... "
+     if [ ! -f "$ZOOPIDFILE" ]

java/zookeeper-server/files/zoo.cfg.patch

@@ +1 @@
+--- /dev/null   2010-10-17 13:27:21.000000000 -0400
++++ conf/zoo.cfg        2010-09-04 13:37:08.000000000 -0400
+@@ -0,0 +1,12 @@
++# The number of milliseconds of each tick
++tickTime=2000
++# The number of ticks that the initial
++# synchronization phase can take
++initLimit=10
++# The number of ticks that can pass between
++# sending a request and getting an acknowledgement
++syncLimit=5
++# the directory where the snapshot is stored.
++dataDir=/Users/nrh/projects/zookeeper/var/data
++# the port at which the clients will connect
++clientPort=2181