You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ph...@apache.org on 2008/06/24 21:19:06 UTC
svn commit: r671309 [1/2] - in /hadoop/zookeeper/trunk: ./ bin/ conf/ src/c/
src/c/include/ src/c/src/ src/c/tests/ src/java/jmx/org/apache/zookeeper/jmx/
src/java/jmx/org/apache/zookeeper/jmx/server/
src/java/jmx/org/apache/zookeeper/jmx/server/quorum...
Author: phunt
Date: Tue Jun 24 12:19:02 2008
New Revision: 671309
URL: http://svn.apache.org/viewvc?rev=671309&view=rev
Log:
Added svn:eol-style propset to text files. See ZOOKEEPER-45
Modified:
hadoop/zookeeper/trunk/README.txt (props changed)
hadoop/zookeeper/trunk/bin/zkCleanup.sh (props changed)
hadoop/zookeeper/trunk/bin/zkCli.sh (props changed)
hadoop/zookeeper/trunk/bin/zkEnv.sh (props changed)
hadoop/zookeeper/trunk/bin/zkServer.sh (props changed)
hadoop/zookeeper/trunk/conf/log4j.properties (props changed)
hadoop/zookeeper/trunk/conf/zoo_sample.cfg (props changed)
hadoop/zookeeper/trunk/src/c/ChangeLog (contents, props changed)
hadoop/zookeeper/trunk/src/c/INSTALL (contents, props changed)
hadoop/zookeeper/trunk/src/c/LICENSE (contents, props changed)
hadoop/zookeeper/trunk/src/c/Makefile.am (contents, props changed)
hadoop/zookeeper/trunk/src/c/README (contents, props changed)
hadoop/zookeeper/trunk/src/c/acinclude.m4 (props changed)
hadoop/zookeeper/trunk/src/c/aminclude.am (props changed)
hadoop/zookeeper/trunk/src/c/include/proto.h (props changed)
hadoop/zookeeper/trunk/src/c/include/recordio.h (props changed)
hadoop/zookeeper/trunk/src/c/include/zookeeper.h (props changed)
hadoop/zookeeper/trunk/src/c/src/cli.c (props changed)
hadoop/zookeeper/trunk/src/c/src/load_gen.c (props changed)
hadoop/zookeeper/trunk/src/c/src/mt_adaptor.c (props changed)
hadoop/zookeeper/trunk/src/c/src/recordio.c (props changed)
hadoop/zookeeper/trunk/src/c/src/st_adaptor.c (props changed)
hadoop/zookeeper/trunk/src/c/src/zk_adaptor.h (props changed)
hadoop/zookeeper/trunk/src/c/src/zk_log.c (props changed)
hadoop/zookeeper/trunk/src/c/src/zk_log.h (props changed)
hadoop/zookeeper/trunk/src/c/src/zookeeper.c (props changed)
hadoop/zookeeper/trunk/src/c/tests/CppAssertHelper.h (props changed)
hadoop/zookeeper/trunk/src/c/tests/LibCMocks.cc (props changed)
hadoop/zookeeper/trunk/src/c/tests/LibCMocks.h (props changed)
hadoop/zookeeper/trunk/src/c/tests/LibCSymTable.cc (props changed)
hadoop/zookeeper/trunk/src/c/tests/LibCSymTable.h (props changed)
hadoop/zookeeper/trunk/src/c/tests/MocksBase.cc (props changed)
hadoop/zookeeper/trunk/src/c/tests/MocksBase.h (props changed)
hadoop/zookeeper/trunk/src/c/tests/PthreadMocks.cc (props changed)
hadoop/zookeeper/trunk/src/c/tests/PthreadMocks.h (props changed)
hadoop/zookeeper/trunk/src/c/tests/TestDriver.cc (props changed)
hadoop/zookeeper/trunk/src/c/tests/TestOperations.cc (props changed)
hadoop/zookeeper/trunk/src/c/tests/TestZookeeperClose.cc (props changed)
hadoop/zookeeper/trunk/src/c/tests/TestZookeeperInit.cc (props changed)
hadoop/zookeeper/trunk/src/c/tests/ThreadingUtil.cc (props changed)
hadoop/zookeeper/trunk/src/c/tests/ThreadingUtil.h (props changed)
hadoop/zookeeper/trunk/src/c/tests/Util.cc (props changed)
hadoop/zookeeper/trunk/src/c/tests/Util.h (props changed)
hadoop/zookeeper/trunk/src/c/tests/ZKMocks.cc (props changed)
hadoop/zookeeper/trunk/src/c/tests/ZKMocks.h (props changed)
hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/CommonNames.java (props changed)
hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/MBeanRegistry.java (props changed)
hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/ZKMBeanInfo.java (props changed)
hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/ConnectionBean.java (props changed)
hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/ConnectionMXBean.java (props changed)
hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/DataTreeBean.java (props changed)
hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/DataTreeMXBean.java (props changed)
hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/ZooKeeperServerBean.java (props changed)
hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/ZooKeeperServerMXBean.java (props changed)
hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/FollowerBean.java (props changed)
hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/FollowerMXBean.java (props changed)
hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LeaderBean.java (props changed)
hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LeaderElectionBean.java (props changed)
hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LeaderElectionMXBean.java (props changed)
hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LeaderMXBean.java (props changed)
hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LocalPeerBean.java (props changed)
hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LocalPeerMXBean.java (props changed)
hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/QuorumBean.java (props changed)
hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/QuorumMXBean.java (props changed)
hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/RemotePeerBean.java (props changed)
hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/RemotePeerMXBean.java (props changed)
hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/ServerBean.java (props changed)
hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/ServerMXBean.java (props changed)
hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/ManagedZooKeeperServer.java (props changed)
hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/ObservableDataTree.java (props changed)
hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/ObservableNIOServerCnxn.java (props changed)
hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/ObservableZooKeeperServer.java (props changed)
hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/ZooKeeperObserverNotifier.java (props changed)
hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/quorum/ManagedQuorumPeer.java (props changed)
hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/quorum/ObservableFollower.java (props changed)
hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/quorum/ObservableFollowerZooKeeperServer.java (props changed)
hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/quorum/ObservableLeader.java (props changed)
hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/quorum/ObservableLeaderZooKeeperServer.java (props changed)
hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/quorum/ObservableQuorumPeer.java (props changed)
hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/ConnectionObserver.java (props changed)
hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/DataTreeObserver.java (props changed)
hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/EventInfo.java (props changed)
hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/ObservableComponent.java (props changed)
hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/ObserverManager.java (props changed)
hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/QuorumPeerObserver.java (props changed)
hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/ServerObserver.java (props changed)
hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/ZooKeeperObserverManager.java (props changed)
hadoop/zookeeper/trunk/src/java/lib/cobertura/lib/jakarta-oro-license.txt (props changed)
hadoop/zookeeper/trunk/src/java/lib/svnant/license.txt (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/jute/BinaryInputArchive.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/jute/BinaryOutputArchive.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/jute/CsvInputArchive.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/jute/CsvOutputArchive.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/jute/Index.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/jute/InputArchive.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/jute/OutputArchive.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/jute/Record.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/jute/RecordReader.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/jute/RecordWriter.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/jute/Utils.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/jute/XmlInputArchive.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/jute/XmlOutputArchive.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/CGenerator.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/CppGenerator.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JBoolean.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JBuffer.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JByte.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JCompType.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JDouble.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JField.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JFile.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JFloat.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JInt.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JLong.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JMap.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JRecord.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JString.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JType.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JVector.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JavaGenerator.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/ParseException.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/Rcc.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/RccConstants.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/RccTokenManager.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/SimpleCharStream.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/Token.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/TokenMgrError.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/AsyncCallback.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientCnxn.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/KeeperException.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ServerAdminClient.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/Version.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/Watcher.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooDefs.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeper.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ByteBufferInputStream.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/DataNode.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/DataTree.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/FinalRequestProcessor.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/LogFormatter.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/PrepRequestProcessor.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/PurgeTxnLog.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/Request.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/RequestProcessor.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ServerCnxn.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ServerConfig.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ServerStats.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/SessionTracker.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/SessionTrackerImpl.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/SyncRequestProcessor.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/TraceFormatter.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/WatchManager.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooTrace.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/AuthenticationProvider.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/DigestAuthenticationProvider.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/HostAuthenticationProvider.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/IPAuthenticationProvider.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/ProviderRegistry.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/AckRequestProcessor.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/AuthFastLeaderElection.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/CommitProcessor.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Election.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FastLeaderElection.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Follower.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerHandler.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerRequestProcessor.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerSessionTracker.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerZooKeeperServer.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Leader.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LeaderElection.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LeaderZooKeeperServer.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/ProposalRequestProcessor.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumCnxManager.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumStats.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/SendAckRequestProcessor.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Vote.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/util/Profiler.java (props changed)
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/version/util/VerGen.java (props changed)
hadoop/zookeeper/trunk/src/java/test/config/findbugsExcludeFile.xml (props changed)
hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/server/DeserializationPerfTest.java (props changed)
hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/server/SerializationPerfTest.java (props changed)
hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/server/ZooKeeperServerTest.java (props changed)
hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/AsyncTest.java (props changed)
hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ClientTest.java (props changed)
hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/DataTreeTest.java (props changed)
hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/GenerateLoad.java (props changed)
hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/IntegrityCheck.java (props changed)
hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/OOMTest.java (props changed)
hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/QuorumTest.java (props changed)
hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/RecoveryTest.java (props changed)
hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/SessionTest.java (props changed)
hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/SledgeHammer.java (props changed)
hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/TestHammer.java (props changed)
hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ZooKeeperTestClient.java (props changed)
Propchange: hadoop/zookeeper/trunk/README.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: hadoop/zookeeper/trunk/bin/zkCleanup.sh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: hadoop/zookeeper/trunk/bin/zkCli.sh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: hadoop/zookeeper/trunk/bin/zkEnv.sh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: hadoop/zookeeper/trunk/bin/zkServer.sh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: hadoop/zookeeper/trunk/conf/log4j.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: hadoop/zookeeper/trunk/conf/zoo_sample.cfg
------------------------------------------------------------------------------
svn:eol-style = native
Modified: hadoop/zookeeper/trunk/src/c/ChangeLog
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/c/ChangeLog?rev=671309&r1=671308&r2=671309&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/src/c/ChangeLog (original)
+++ hadoop/zookeeper/trunk/src/c/ChangeLog Tue Jun 24 12:19:02 2008
@@ -1,116 +1,116 @@
-Release 2.1.1
-2008-04-30 Andrew Kornev <ak...@users.sourceforge.net>
-
- * changed the distributino package name to "c-client-src"
-
-Release 2.1.0
-2008-04-30 Andrew Kornev <ak...@users.sourceforge.net>
-
- * added the client latency diagnostics; the client prints a warning when the
- reponse latency exceeds 20ms
-
- * modified logging format to report the znode path for which the zookeeper
- operation is called
-
- * fixed a minor bug where error messages were missing for some of the newer
- zookeeper error codes (ZCLOSING and ZNOTHING).
-
- * improved logging by adding the XID to the message to make it easy to match
- requests to responses
-
- * fixed the bug causing sporadic session termination and timeouts
-
- * added a new return code to zookeeper_process() -- ZNOTHING --
- that indicates that the socket has no more data to read
-
- * more unit tests added
-
-Release 1.1.3
-2008-02-07 Andrew Kornev <ak...@users.sourceforge.net>
-
- * get_xid() is not thread-safe (xid initialization race condition
- in the multi-threaded mode).
-
- * the I/O thread doesnt automatically terminate on AUTH_FAILURE and
- SESSION_EXPIRED events.
-
- * all session events should be processed on the completion thread.
-
- * PING operation doesnt atomically enqueue the completion and
- send buffers like other operations do.
-
- * corrected zookeeper_init() doxygen docs.
-
- * new unit tests added.
-
-
-Release 1.1.2
-2008-01-24 Andrew Kornev <ak...@users.sourceforge.net>
-
- * fixed a race condition caused by the code in zookeeper_process()
- and free_completions() setting sc->complete to 1 without proper
- synchronization;
-
- * fixed zoo_get() not updating buffer_len value with the actual
- buffer length on return; added missing enter_critical/leave_critical
- calls to the async ZK operations.
-
- * Replaced select() with poll() to fix the problem with the FD_SET
- macro causing stack corruption for FDs higher than 1024
-
- * Added zoo_set_log_stream() to the public API. The function allows
- applications to specify a different log file.
-
- * Removed unused declarations from zookeeper.h (ACL related)
-
- * changed zoo_get() signature to take a pointer to buffer length.
- The function sets the parameter to the actual data length upon return.
-
- * the watcher callback now takes the zhandle as its first parameter. This
- is to avoid a race condition in the multi-threaded client when a watcher
- is called before zookeeper_init() has returned.
-
- * fixed zookeeper_close() resource leaks and race conditions,
- fixed the race condition causing xid mismatch.
-
- * added support for cppunit, added new targets: "check" and "run-check"
- to build and run unit tests.
-
- * Changed the signature of zookeeper_init(): it now takes a context pointer
- as a parameter. This is to avoid a race condition in the multi-threaded client.
-
- * Using a self-pipe rather than SIGUSR1 to wake up select() in the I/O thread
-
- * Added the doxygen target to the autoconf scripts
-
- * Pulled out the logging functionality from zookeeper.c to zk_log.c/.h.
- Fixed a minor issue with PING responses being unnecessarily put on
- the completion queue rather than simply dropped. Make use of DLL_EXPORT
- symbol for building shared lib on cygwin.
-
- * Implemented new Zookeeper operation sync() to flush the leader channel
- to ensure that all updates have reached the followers.
-
- * Synchronous methods not being handled properly on disconnect
-
- * breed: fixed an incorrect parameter passed to zookeeper API by
- the Sync API wrapper functions
-
- * breed: the set and delete commands now support both Sync and Async API.
- Prefix the command name with an 'a' to call the Async API: aset, adelete
-
- * Make sure mutexes and condition variables are properly initialized
- and destroyed
-
- * Fixed zookeeper_close() causing core dumps with mt_adaptor
-
-
-Release 1.0.0
-2007-11-27 Andrew Kornev <ak...@users.sourceforge.net>
-
- * configure.ac and Makefile.am added support for GNU autotools
-
- * recordio.c/.h updated jute IO routines to use bit-explicit integer types
- (int32_t vs. int, and int64_t vs. long long)
-
+Release 2.1.1
+2008-04-30 Andrew Kornev <ak...@users.sourceforge.net>
+
+ * changed the distributino package name to "c-client-src"
+
+Release 2.1.0
+2008-04-30 Andrew Kornev <ak...@users.sourceforge.net>
+
+ * added the client latency diagnostics; the client prints a warning when the
+ reponse latency exceeds 20ms
+
+ * modified logging format to report the znode path for which the zookeeper
+ operation is called
+
+ * fixed a minor bug where error messages were missing for some of the newer
+ zookeeper error codes (ZCLOSING and ZNOTHING).
+
+ * improved logging by adding the XID to the message to make it easy to match
+ requests to responses
+
+ * fixed the bug causing sporadic session termination and timeouts
+
+ * added a new return code to zookeeper_process() -- ZNOTHING --
+ that indicates that the socket has no more data to read
+
+ * more unit tests added
+
+Release 1.1.3
+2008-02-07 Andrew Kornev <ak...@users.sourceforge.net>
+
+ * get_xid() is not thread-safe (xid initialization race condition
+ in the multi-threaded mode).
+
+ * the I/O thread doesnt automatically terminate on AUTH_FAILURE and
+ SESSION_EXPIRED events.
+
+ * all session events should be processed on the completion thread.
+
+ * PING operation doesnt atomically enqueue the completion and
+ send buffers like other operations do.
+
+ * corrected zookeeper_init() doxygen docs.
+
+ * new unit tests added.
+
+
+Release 1.1.2
+2008-01-24 Andrew Kornev <ak...@users.sourceforge.net>
+
+ * fixed a race condition caused by the code in zookeeper_process()
+ and free_completions() setting sc->complete to 1 without proper
+ synchronization;
+
+ * fixed zoo_get() not updating buffer_len value with the actual
+ buffer length on return; added missing enter_critical/leave_critical
+ calls to the async ZK operations.
+
+ * Replaced select() with poll() to fix the problem with the FD_SET
+ macro causing stack corruption for FDs higher than 1024
+
+ * Added zoo_set_log_stream() to the public API. The function allows
+ applications to specify a different log file.
+
+ * Removed unused declarations from zookeeper.h (ACL related)
+
+ * changed zoo_get() signature to take a pointer to buffer length.
+ The function sets the parameter to the actual data length upon return.
+
+ * the watcher callback now takes the zhandle as its first parameter. This
+ is to avoid a race condition in the multi-threaded client when a watcher
+ is called before zookeeper_init() has returned.
+
+ * fixed zookeeper_close() resource leaks and race conditions,
+ fixed the race condition causing xid mismatch.
+
+ * added support for cppunit, added new targets: "check" and "run-check"
+ to build and run unit tests.
+
+ * Changed the signature of zookeeper_init(): it now takes a context pointer
+ as a parameter. This is to avoid a race condition in the multi-threaded client.
+
+ * Using a self-pipe rather than SIGUSR1 to wake up select() in the I/O thread
+
+ * Added the doxygen target to the autoconf scripts
+
+ * Pulled out the logging functionality from zookeeper.c to zk_log.c/.h.
+ Fixed a minor issue with PING responses being unnecessarily put on
+ the completion queue rather than simply dropped. Make use of DLL_EXPORT
+ symbol for building shared lib on cygwin.
+
+ * Implemented new Zookeeper operation sync() to flush the leader channel
+ to ensure that all updates have reached the followers.
+
+ * Synchronous methods not being handled properly on disconnect
+
+ * breed: fixed an incorrect parameter passed to zookeeper API by
+ the Sync API wrapper functions
+
+ * breed: the set and delete commands now support both Sync and Async API.
+ Prefix the command name with an 'a' to call the Async API: aset, adelete
+
+ * Make sure mutexes and condition variables are properly initialized
+ and destroyed
+
+ * Fixed zookeeper_close() causing core dumps with mt_adaptor
+
+
+Release 1.0.0
+2007-11-27 Andrew Kornev <ak...@users.sourceforge.net>
+
+ * configure.ac and Makefile.am added support for GNU autotools
+
+ * recordio.c/.h updated jute IO routines to use bit-explicit integer types
+ (int32_t vs. int, and int64_t vs. long long)
+
* README rough draft
\ No newline at end of file
Propchange: hadoop/zookeeper/trunk/src/c/ChangeLog
------------------------------------------------------------------------------
svn:eol-style = native
Modified: hadoop/zookeeper/trunk/src/c/INSTALL
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/c/INSTALL?rev=671309&r1=671308&r2=671309&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/src/c/INSTALL (original)
+++ hadoop/zookeeper/trunk/src/c/INSTALL Tue Jun 24 12:19:02 2008
@@ -1,234 +1,234 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006 Free Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package. The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
-
- The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation. It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions. Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
- It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
-
- If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release. If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
- The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
-
-The simplest way to compile this package is:
-
- 1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system.
-
- Running `configure' might take a while. While running, it prints
- some messages telling which features it is checking for.
-
- 2. Type `make' to compile the package.
-
- 3. Optionally, type `make check' to run any self-tests that come with
- the package.
-
- 4. Type `make install' to install the programs and any data files and
- documentation.
-
- 5. You can remove the program binaries and object files from the
- source code directory by typing `make clean'. To also remove the
- files that `configure' created (so you can compile the package for
- a different kind of computer), type `make distclean'. There is
- also a `make maintainer-clean' target, but that is intended mainly
- for the package's developers. If you use it, you may have to get
- all sorts of other programs in order to regenerate files that came
- with the distribution.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about. Run `./configure --help' for
-details on some of the pertinent environment variables.
-
- You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment. Here
-is an example:
-
- ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
- *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory. To do this, you can use GNU `make'. `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
- With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory. After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc. You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
-
- You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files. If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
- In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
- If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System). The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
- For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option. TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
- CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
- OS KERNEL-OS
-
- See the file `config.sub' for the possible values of each field. If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
- If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
- If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists. Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'. However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost. In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'. For example:
-
- ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug. Until the bug is fixed you can use this workaround:
-
- CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
- Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
- Print the version of Autoconf used to generate the `configure'
- script, and exit.
-
-`--cache-file=FILE'
- Enable the cache: use and save the results of the tests in FILE,
- traditionally `config.cache'. FILE defaults to `/dev/null' to
- disable caching.
-
-`--config-cache'
-`-C'
- Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
- Do not print messages saying which checks are being made. To
- suppress all normal output, redirect it to `/dev/null' (any error
- messages will still be shown).
-
-`--srcdir=DIR'
- Look for the package's source code in directory DIR. Usually
- `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options. Run
-`configure --help' for more details.
-
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006 Free Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
+
+ The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions. Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+ It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring. Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+ If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release. If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+ The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system.
+
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+ the package.
+
+ 4. Type `make install' to install the programs and any data files and
+ documentation.
+
+ 5. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+ also a `make maintainer-clean' target, but that is intended mainly
+ for the package's developers. If you use it, you may have to get
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+Compilers and Options
+=====================
+
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about. Run `./configure --help' for
+details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here
+is an example:
+
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory. To do this, you can use GNU `make'. `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script. `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+Installation Names
+==================
+
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files. Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System). The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+ For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
+`--build=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+ CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+ OS KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+ If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists. Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+Variables not defined in a site shell script can be set in the
+environment passed to `configure'. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
+
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+`configure' recognizes the following options to control how it operates.
+
+`--help'
+`-h'
+ Print a summary of the options to `configure', and exit.
+
+`--version'
+`-V'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+`--cache-file=FILE'
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
+ disable caching.
+
+`--config-cache'
+`-C'
+ Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to `/dev/null' (any error
+ messages will still be shown).
+
+`--srcdir=DIR'
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
+
Propchange: hadoop/zookeeper/trunk/src/c/INSTALL
------------------------------------------------------------------------------
svn:eol-style = native
Modified: hadoop/zookeeper/trunk/src/c/LICENSE
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/c/LICENSE?rev=671309&r1=671308&r2=671309&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/src/c/LICENSE (original)
+++ hadoop/zookeeper/trunk/src/c/LICENSE Tue Jun 24 12:19:02 2008
@@ -1,202 +1,202 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
Propchange: hadoop/zookeeper/trunk/src/c/LICENSE
------------------------------------------------------------------------------
svn:eol-style = native
Modified: hadoop/zookeeper/trunk/src/c/Makefile.am
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/c/Makefile.am?rev=671309&r1=671308&r2=671309&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/src/c/Makefile.am (original)
+++ hadoop/zookeeper/trunk/src/c/Makefile.am Tue Jun 24 12:19:02 2008
@@ -1,94 +1,94 @@
-# need this for Doxygen integration
-include $(top_srcdir)/aminclude.am
-
-AM_CPPFLAGS = -Iinclude -Igenerated
-AM_CFLAGS = -Wall -Werror
-CXXFLAGS += -Wall
-
-LIB_LDFLAGS = -no-undefined -version-info 2
-
-pkginclude_HEADERS = include/zookeeper.h include/recordio.h generated/zookeeper.jute.h
-EXTRA_DIST=LICENSE
-
-COMMON_SRC = src/zookeeper.c include/zookeeper.h \
- src/recordio.c include/recordio.h include/proto.h \
- src/zk_adaptor.h generated/zookeeper.jute.c \
- src/zk_log.h src/zk_log.c
-
-noinst_LTLIBRARIES = libzkst.la
-libzkst_la_SOURCES =$(COMMON_SRC) src/st_adaptor.c
-
-lib_LTLIBRARIES = libzookeeper_st.la
-libzookeeper_st_la_SOURCES =
-libzookeeper_st_la_LIBADD=libzkst.la
-libzookeeper_st_la_DEPENDENCIES=libzkst.la
-libzookeeper_st_la_LDFLAGS = $(LIB_LDFLAGS)
-
-if WANT_SYNCAPI
-noinst_LTLIBRARIES += libzkmt.la
-libzkmt_la_SOURCES =$(COMMON_SRC) src/mt_adaptor.c
-libzkmt_la_CFLAGS = -DTHREADED
-
-lib_LTLIBRARIES += libzookeeper_mt.la
-libzookeeper_mt_la_SOURCES =
-libzookeeper_mt_la_LIBADD=libzkmt.la -lpthread
-libzookeeper_mt_la_DEPENDENCIES=libzkmt.la
-libzookeeper_mt_la_LDFLAGS = $(LIB_LDFLAGS)
-endif
-
-bin_PROGRAMS = cli_st
-
-cli_st_SOURCES = src/cli.c
-cli_st_LDADD = libzookeeper_st.la
-
-if WANT_SYNCAPI
-bin_PROGRAMS += cli_mt load_gen
-
-cli_mt_SOURCES = src/cli.c
-cli_mt_LDADD = libzookeeper_mt.la
-cli_mt_CFLAGS = -DTHREADED
-
-load_gen_SOURCES = src/load_gen.c
-load_gen_LDADD = libzookeeper_mt.la
-load_gen_CFLAGS = -DTHREADED
-
-endif
-
-#########################################################################
-# build and run unit tests
-
-EXTRA_DIST+=$(wildcard tests/*.cc) $(wildcard tests/*.h) \
- tests/wrappers.opt tests/wrappers-mt.opt
-
-TEST_SOURCES = tests/TestDriver.cc tests/LibCMocks.cc tests/LibCSymTable.cc \
- tests/MocksBase.cc tests/ZKMocks.cc tests/Util.cc tests/ThreadingUtil.cc \
- tests/TestOperations.cc tests/TestZookeeperInit.cc tests/TestZookeeperClose.cc
-
-SYMBOL_WRAPPERS=$(shell cat tests/wrappers.opt)
-
-check_PROGRAMS = zktest-st
-nodist_zktest_st_SOURCES = $(TEST_SOURCES)
-zktest_st_LDADD = libzkst.la $(CPPUNIT_LIBS)
-zktest_st_CXXFLAGS = -DUSE_STATIC_LIB $(CPPUNIT_CFLAGS)
-zktest_st_LDFLAGS = -static-libtool-libs $(SYMBOL_WRAPPERS)
-
-if WANT_SYNCAPI
- check_PROGRAMS += zktest-mt
- nodist_zktest_mt_SOURCES = $(TEST_SOURCES) tests/PthreadMocks.cc
- zktest_mt_LDADD = libzkmt.la -lpthread $(CPPUNIT_LIBS)
- zktest_mt_CXXFLAGS = -DUSE_STATIC_LIB -DTHREADED $(CPPUNIT_CFLAGS)
- SYMBOL_WRAPPERS_MT=$(SYMBOL_WRAPPERS) $(shell cat tests/wrappers-mt.opt)
- zktest_mt_LDFLAGS = -static-libtool-libs $(SYMBOL_WRAPPERS_MT)
-endif
-
-run-check: check
- ./zktest-st $(TEST_OPTIONS)
-if WANT_SYNCAPI
- ./zktest-mt $(TEST_OPTIONS)
-endif
-
-clean-local: clean-check
- $(RM) $(DX_CLEANFILES)
-
-clean-check:
- $(RM) $(nodist_zktest_st_OBJECTS) $(nodist_zktest_mt_OBJECTS)
+# need this for Doxygen integration
+include $(top_srcdir)/aminclude.am
+
+AM_CPPFLAGS = -Iinclude -Igenerated
+AM_CFLAGS = -Wall -Werror
+CXXFLAGS += -Wall
+
+LIB_LDFLAGS = -no-undefined -version-info 2
+
+pkginclude_HEADERS = include/zookeeper.h include/recordio.h generated/zookeeper.jute.h
+EXTRA_DIST=LICENSE
+
+COMMON_SRC = src/zookeeper.c include/zookeeper.h \
+ src/recordio.c include/recordio.h include/proto.h \
+ src/zk_adaptor.h generated/zookeeper.jute.c \
+ src/zk_log.h src/zk_log.c
+
+noinst_LTLIBRARIES = libzkst.la
+libzkst_la_SOURCES =$(COMMON_SRC) src/st_adaptor.c
+
+lib_LTLIBRARIES = libzookeeper_st.la
+libzookeeper_st_la_SOURCES =
+libzookeeper_st_la_LIBADD=libzkst.la
+libzookeeper_st_la_DEPENDENCIES=libzkst.la
+libzookeeper_st_la_LDFLAGS = $(LIB_LDFLAGS)
+
+if WANT_SYNCAPI
+noinst_LTLIBRARIES += libzkmt.la
+libzkmt_la_SOURCES =$(COMMON_SRC) src/mt_adaptor.c
+libzkmt_la_CFLAGS = -DTHREADED
+
+lib_LTLIBRARIES += libzookeeper_mt.la
+libzookeeper_mt_la_SOURCES =
+libzookeeper_mt_la_LIBADD=libzkmt.la -lpthread
+libzookeeper_mt_la_DEPENDENCIES=libzkmt.la
+libzookeeper_mt_la_LDFLAGS = $(LIB_LDFLAGS)
+endif
+
+bin_PROGRAMS = cli_st
+
+cli_st_SOURCES = src/cli.c
+cli_st_LDADD = libzookeeper_st.la
+
+if WANT_SYNCAPI
+bin_PROGRAMS += cli_mt load_gen
+
+cli_mt_SOURCES = src/cli.c
+cli_mt_LDADD = libzookeeper_mt.la
+cli_mt_CFLAGS = -DTHREADED
+
+load_gen_SOURCES = src/load_gen.c
+load_gen_LDADD = libzookeeper_mt.la
+load_gen_CFLAGS = -DTHREADED
+
+endif
+
+#########################################################################
+# build and run unit tests
+
+EXTRA_DIST+=$(wildcard tests/*.cc) $(wildcard tests/*.h) \
+ tests/wrappers.opt tests/wrappers-mt.opt
+
+TEST_SOURCES = tests/TestDriver.cc tests/LibCMocks.cc tests/LibCSymTable.cc \
+ tests/MocksBase.cc tests/ZKMocks.cc tests/Util.cc tests/ThreadingUtil.cc \
+ tests/TestOperations.cc tests/TestZookeeperInit.cc tests/TestZookeeperClose.cc
+
+SYMBOL_WRAPPERS=$(shell cat tests/wrappers.opt)
+
+check_PROGRAMS = zktest-st
+nodist_zktest_st_SOURCES = $(TEST_SOURCES)
+zktest_st_LDADD = libzkst.la $(CPPUNIT_LIBS)
+zktest_st_CXXFLAGS = -DUSE_STATIC_LIB $(CPPUNIT_CFLAGS)
+zktest_st_LDFLAGS = -static-libtool-libs $(SYMBOL_WRAPPERS)
+
+if WANT_SYNCAPI
+ check_PROGRAMS += zktest-mt
+ nodist_zktest_mt_SOURCES = $(TEST_SOURCES) tests/PthreadMocks.cc
+ zktest_mt_LDADD = libzkmt.la -lpthread $(CPPUNIT_LIBS)
+ zktest_mt_CXXFLAGS = -DUSE_STATIC_LIB -DTHREADED $(CPPUNIT_CFLAGS)
+ SYMBOL_WRAPPERS_MT=$(SYMBOL_WRAPPERS) $(shell cat tests/wrappers-mt.opt)
+ zktest_mt_LDFLAGS = -static-libtool-libs $(SYMBOL_WRAPPERS_MT)
+endif
+
+run-check: check
+ ./zktest-st $(TEST_OPTIONS)
+if WANT_SYNCAPI
+ ./zktest-mt $(TEST_OPTIONS)
+endif
+
+clean-local: clean-check
+ $(RM) $(DX_CLEANFILES)
+
+clean-check:
+ $(RM) $(nodist_zktest_st_OBJECTS) $(nodist_zktest_mt_OBJECTS)
Propchange: hadoop/zookeeper/trunk/src/c/Makefile.am
------------------------------------------------------------------------------
svn:eol-style = native