[jgroups-git] [belaban/JGroups] bcedd3: Merge branch 'master' into JGRP-1310
Brought to you by:
belaban
Menu
▾
▴
[jgroups-git] [belaban/JGroups] bcedd3: Merge branch 'master' into JGRP-1310
|
From: <no...@gi...> - 2011-04-16 17:23:53
|
Branch: refs/heads/master Home: https://github.com/belaban/JGroups Commit: bcedd3db10f8307e96672c97a410db99e29da8f4 https://github.com/belaban/JGroups/commit/bcedd3db10f8307e96672c97a410db99e29da8f4 Author: William Burns <Wil...@Re...> Date: 2011-04-16 (Sat, 16 Apr 2011) Changed paths: R .classpath R .project R CREDITS M INSTALL.html M bin/draw.bat M bin/draw.sh M bin/gossiprouter.sh M build.xml M conf/EncryptKeyStore.xml M conf/EncryptNoKeyStore.xml M conf/auth_X509.xml M conf/auth_fixedlist.xml M conf/auth_md5.xml M conf/auth_regex.xml M conf/auth_simple.xml M conf/bare-bones.xml R conf/bsh.xml R conf/compress.xml M conf/encrypt-entire-message.xml M conf/encrypt.xml M conf/execution-service.xml M conf/fast-local.xml R conf/flush-tcp-nio.xml M conf/flush-tcp.xml M conf/flush-udp.xml R conf/gossip-service.xml R conf/jboss-service.xml M conf/jg-magic-map.xml M conf/jg-protocol-ids.xml M conf/manifest.mf M conf/mping.xml R conf/multiplexer-service.xml R conf/multiplexer-xmbean.xml R conf/performancetestconfig.txt R conf/persist.properties M conf/sequencer.xml R conf/sfc.xml R conf/smack.xml R conf/smack_tunnel.xml R conf/stacks.xml M conf/tcp-nio.xml M conf/tcp.xml M conf/tcp_nio.xml M conf/tcpgossip.xml M conf/tunnel.xml M conf/udp-largecluster.xml M conf/udp.xml A doc/API_Changes.txt R doc/ReleaseNotes-2.12.txt A doc/ReleaseNotes-3.0.0.txt R doc/design/Multiplexer.txt R doc/design/SimpleFlowControl.txt M doc/manual/en/modules/advanced.xml M doc/manual/en/modules/api.xml M doc/manual/en/modules/installation.xml R lib/bsh-1.2b3.jar A lib/bsh.jar M lib/licenses/thirdparty-licenses.xml M pom.xml M src/org/jgroups/Address.java R src/org/jgroups/BlockEvent.java M src/org/jgroups/Channel.java R src/org/jgroups/ChannelFactory.java M src/org/jgroups/ChannelListener.java R src/org/jgroups/ChannelListenerAdapter.java M src/org/jgroups/Event.java R src/org/jgroups/ExtendedMembershipListener.java R src/org/jgroups/ExtendedMessageListener.java R src/org/jgroups/ExtendedReceiver.java R src/org/jgroups/ExtendedReceiverAdapter.java R src/org/jgroups/GetStateEvent.java M src/org/jgroups/Global.java M src/org/jgroups/JChannel.java R src/org/jgroups/JChannelFactory.java M src/org/jgroups/MembershipListener.java M src/org/jgroups/MergeView.java M src/org/jgroups/Message.java M src/org/jgroups/MessageListener.java M src/org/jgroups/ReceiverAdapter.java R src/org/jgroups/SetStateEvent.java R src/org/jgroups/StreamingGetStateEvent.java R src/org/jgroups/StreamingSetStateEvent.java R src/org/jgroups/SuspectEvent.java R src/org/jgroups/UnblockEvent.java M src/org/jgroups/Version.java M src/org/jgroups/View.java M src/org/jgroups/ViewId.java M src/org/jgroups/auth/FixedMembershipToken.java M src/org/jgroups/auth/MD5Token.java M src/org/jgroups/auth/RegexMembership.java M src/org/jgroups/auth/SimpleToken.java M src/org/jgroups/auth/X509Token.java R src/org/jgroups/blocks/DistributedLockManager.java R src/org/jgroups/blocks/DistributedQueue.java R src/org/jgroups/blocks/DistributedTree.java M src/org/jgroups/blocks/GridFile.java M src/org/jgroups/blocks/GroupRequest.java R src/org/jgroups/blocks/LazyRemovalSet.java R src/org/jgroups/blocks/LockManager.java R src/org/jgroups/blocks/LockMultiLockedException.java R src/org/jgroups/blocks/LockNotGrantedException.java R src/org/jgroups/blocks/LockNotReleasedException.java R src/org/jgroups/blocks/LockingException.java R src/org/jgroups/blocks/MembershipListenerAdapter.java M src/org/jgroups/blocks/MessageDispatcher.java R src/org/jgroups/blocks/MessageListenerAdapter.java M src/org/jgroups/blocks/MethodCall.java M src/org/jgroups/blocks/MultiRequest.java R src/org/jgroups/blocks/NotificationBus.java M src/org/jgroups/blocks/PartitionedHashMap.java R src/org/jgroups/blocks/PullPushAdapter.java M src/org/jgroups/blocks/ReplCache.java M src/org/jgroups/blocks/ReplicatedHashMap.java M src/org/jgroups/blocks/ReplicatedTree.java M src/org/jgroups/blocks/Request.java M src/org/jgroups/blocks/RequestCorrelator.java M src/org/jgroups/blocks/RequestOptions.java A src/org/jgroups/blocks/ResponseMode.java M src/org/jgroups/blocks/RpcDispatcher.java M src/org/jgroups/blocks/TCPConnectionMap.java R src/org/jgroups/blocks/TwoPhaseVotingAdapter.java R src/org/jgroups/blocks/TwoPhaseVotingListener.java M src/org/jgroups/blocks/UnicastRequest.java R src/org/jgroups/blocks/UpdateException.java R src/org/jgroups/blocks/VoteException.java R src/org/jgroups/blocks/VoteResponseProcessor.java R src/org/jgroups/blocks/VotingAdapter.java R src/org/jgroups/blocks/VotingListener.java M src/org/jgroups/blocks/executor/ExecutionRunner.java M src/org/jgroups/blocks/executor/ExecutionService.java M src/org/jgroups/blocks/executor/Executions.java M src/org/jgroups/blocks/locking/LockService.java M src/org/jgroups/blocks/locking/Owner.java M src/org/jgroups/blocks/mux/MuxHeader.java M src/org/jgroups/blocks/mux/MuxRpcDispatcher.java M src/org/jgroups/conf/ConfiguratorFactory.java R src/org/jgroups/debug/Profiler.java R src/org/jgroups/debug/ProtocolTester.java R src/org/jgroups/debug/Simulator.java R src/org/jgroups/debug/package.html R src/org/jgroups/demos/CausalDemo.java R src/org/jgroups/demos/DistributedQueueDemo.java R src/org/jgroups/demos/DistributedTreeDemo.java M src/org/jgroups/demos/Draw.java R src/org/jgroups/demos/Draw2Channels.java M src/org/jgroups/demos/DrawCommand.java R src/org/jgroups/demos/DrawRepl.java M src/org/jgroups/demos/ExecutionServiceDemo.java R src/org/jgroups/demos/NotificationBusDemo.java M src/org/jgroups/demos/QuoteClient.java M src/org/jgroups/demos/QuoteServer.java M src/org/jgroups/demos/RelayDemo.java M src/org/jgroups/demos/RelayDemoRpc.java M src/org/jgroups/demos/ReplCacheDemo.java M src/org/jgroups/demos/ReplicatedHashMapDemo.java R src/org/jgroups/demos/ReplicatedTreeDemo.java M src/org/jgroups/demos/Topology.java M src/org/jgroups/demos/TotalOrder.java R src/org/jgroups/demos/TotalTokenDemo.java M src/org/jgroups/demos/applets/DrawApplet.java M src/org/jgroups/demos/wb/GraphPanel.java M src/org/jgroups/demos/wb/SendDialog.java M src/org/jgroups/demos/wb/UserInfoDialog.java M src/org/jgroups/demos/wb/Whiteboard.java M src/org/jgroups/jmx/JmxConfigurator.java R src/org/jgroups/mux/Multiplexer.java R src/org/jgroups/mux/MuxChannel.java R src/org/jgroups/mux/MuxHeader.java R src/org/jgroups/mux/ServiceInfo.java R src/org/jgroups/persistence/CannotConnectException.java R src/org/jgroups/persistence/CannotCreateSchemaException.java R src/org/jgroups/persistence/CannotPersistException.java R src/org/jgroups/persistence/CannotRemoveException.java R src/org/jgroups/persistence/CannotRetrieveException.java R src/org/jgroups/persistence/DBPersistenceManager.java R src/org/jgroups/persistence/FilePersistenceManager.java R src/org/jgroups/persistence/PersistenceFactory.java R src/org/jgroups/persistence/PersistenceManager.java R src/org/jgroups/persistence/package.html M src/org/jgroups/protocols/AuthHeader.java M src/org/jgroups/protocols/BSH.java M src/org/jgroups/protocols/BasicTCP.java M src/org/jgroups/protocols/CENTRAL_EXECUTOR.java M src/org/jgroups/protocols/CENTRAL_LOCK.java M src/org/jgroups/protocols/COMPRESS.java M src/org/jgroups/protocols/DAISYCHAIN.java M src/org/jgroups/protocols/DISCARD.java M src/org/jgroups/protocols/DUPL.java M src/org/jgroups/protocols/Discovery.java M src/org/jgroups/protocols/ENCRYPT.java M src/org/jgroups/protocols/EXAMPLE.java M src/org/jgroups/protocols/Executing.java M src/org/jgroups/protocols/FC.java M src/org/jgroups/protocols/FD.java M src/org/jgroups/protocols/FD_ALL.java M src/org/jgroups/protocols/FD_ICMP.java M src/org/jgroups/protocols/FD_SIMPLE.java M src/org/jgroups/protocols/FD_SOCK.java M src/org/jgroups/protocols/FILE_PING.java M src/org/jgroups/protocols/FRAG.java M src/org/jgroups/protocols/FRAG2.java M src/org/jgroups/protocols/FcHeader.java M src/org/jgroups/protocols/FlowControl.java M src/org/jgroups/protocols/FragHeader.java M src/org/jgroups/protocols/HTOTAL.java R src/org/jgroups/protocols/LOOPBACK.java M src/org/jgroups/protocols/Locking.java M src/org/jgroups/protocols/MERGE2.java R src/org/jgroups/protocols/MERGE3.java R src/org/jgroups/protocols/MERGEFAST.java M src/org/jgroups/protocols/MFC.java M src/org/jgroups/protocols/MPING.java R src/org/jgroups/protocols/PERF_TP.java M src/org/jgroups/protocols/PING.java M src/org/jgroups/protocols/PingData.java M src/org/jgroups/protocols/PingHeader.java M src/org/jgroups/protocols/PrioHeader.java M src/org/jgroups/protocols/RELAY.java M src/org/jgroups/protocols/S3_PING.java M src/org/jgroups/protocols/SCOPE.java M src/org/jgroups/protocols/SEQUENCER.java R src/org/jgroups/protocols/SFC.java M src/org/jgroups/protocols/SHARED_LOOPBACK.java M src/org/jgroups/protocols/SHUFFLE.java R src/org/jgroups/protocols/SMACK.java M src/org/jgroups/protocols/STATS.java M src/org/jgroups/protocols/STOMP.java M src/org/jgroups/protocols/TCPGOSSIP.java M src/org/jgroups/protocols/TCPPING.java M src/org/jgroups/protocols/TP.java M src/org/jgroups/protocols/TUNNEL.java M src/org/jgroups/protocols/TpHeader.java R src/org/jgroups/protocols/TransportedVectorTime.java M src/org/jgroups/protocols/UDP.java M src/org/jgroups/protocols/UFC.java M src/org/jgroups/protocols/UNICAST.java M src/org/jgroups/protocols/UNICAST2.java M src/org/jgroups/protocols/VERIFY_SUSPECT.java R src/org/jgroups/protocols/VIEW_SYNC.java R src/org/jgroups/protocols/obsolete/ENCRYPT.java.txt R src/org/jgroups/protocols/obsolete/ENCRYPT1_4.java.txt R src/org/jgroups/protocols/obsolete/FC.java.txt R src/org/jgroups/protocols/obsolete/FD_PROB.java.txt R src/org/jgroups/protocols/obsolete/FD_RAND.java.txt R src/org/jgroups/protocols/obsolete/FD_SHUN.java.txt R src/org/jgroups/protocols/obsolete/PERF.java.txt R src/org/jgroups/protocols/obsolete/PerfHeader.java.txt R src/org/jgroups/protocols/obsolete/UDP.java.txt R src/org/jgroups/protocols/obsolete/UDP_NIO.java.txt R src/org/jgroups/protocols/obsolete/UNIFORM.java.txt M src/org/jgroups/protocols/pbcast/ClientGmsImpl.java M src/org/jgroups/protocols/pbcast/CoordGmsImpl.java M src/org/jgroups/protocols/pbcast/FLUSH.java M src/org/jgroups/protocols/pbcast/GMS.java M src/org/jgroups/protocols/pbcast/JoinRsp.java M src/org/jgroups/protocols/pbcast/Merger.java M src/org/jgroups/protocols/pbcast/NAKACK.java M src/org/jgroups/protocols/pbcast/NakAckHeader.java M src/org/jgroups/protocols/pbcast/ParticipantGmsImpl.java M src/org/jgroups/protocols/pbcast/STABLE.java M src/org/jgroups/protocols/pbcast/STATE_TRANSFER.java M src/org/jgroups/protocols/pbcast/STREAMING_STATE_TRANSFER.java R src/org/jgroups/stack/AckMcastReceiverWindow.java R src/org/jgroups/stack/AckMcastSenderWindow.java M src/org/jgroups/stack/Configurator.java M src/org/jgroups/stack/GossipData.java M src/org/jgroups/stack/GossipRouter.java M src/org/jgroups/stack/IpAddress.java M src/org/jgroups/stack/NakReceiverWindow.java M src/org/jgroups/stack/Protocol.java M src/org/jgroups/stack/ProtocolStack.java M src/org/jgroups/stack/StateTransferInfo.java M src/org/jgroups/util/AckCollector.java M src/org/jgroups/util/AdditionalDataUUID.java R src/org/jgroups/util/Command.java M src/org/jgroups/util/Digest.java M src/org/jgroups/util/ExposedByteArrayOutputStream.java R src/org/jgroups/util/FIFOMessageQueue.java M src/org/jgroups/util/Headers.java R src/org/jgroups/util/MarshallerPool.java M src/org/jgroups/util/MergeId.java R src/org/jgroups/util/Metronome.java R src/org/jgroups/util/MyReceiver.java M src/org/jgroups/util/PayloadUUID.java R src/org/jgroups/util/Proxy.java R src/org/jgroups/util/Queue.java.concurrent M src/org/jgroups/util/Range.java R src/org/jgroups/util/RingBuffer.java M src/org/jgroups/util/Rsp.java M src/org/jgroups/util/RspList.java M src/org/jgroups/util/SingletonAddress.java M src/org/jgroups/util/Streamable.java M src/org/jgroups/util/TopologyUUID.java M src/org/jgroups/util/UUID.java R src/org/jgroups/util/UnmodifiableVector.java M src/org/jgroups/util/Util.java R src/org/jgroups/util/obsolete/CondVar.java.txt R src/org/jgroups/util/obsolete/List.java.txt R src/org/jgroups/util/todo.txt M tests/junit-functional/org/jgroups/blocks/GroupRequestTest.java R tests/junit-functional/org/jgroups/blocks/LazyRemovalSetTest.java M tests/junit-functional/org/jgroups/protocols/ENCRYPT14KeystoreTest.java M tests/junit-functional/org/jgroups/protocols/ENCRYPTAsymmetricTest.java R tests/junit-functional/org/jgroups/tests/AckMcastSenderWindowTest.java M tests/junit-functional/org/jgroups/tests/BARRIERTest.java M tests/junit-functional/org/jgroups/tests/ConfiguratorTest.java M tests/junit-functional/org/jgroups/tests/CustomProtocolTest.java M tests/junit-functional/org/jgroups/tests/FCTest.java M tests/junit-functional/org/jgroups/tests/FragTest.java M tests/junit-functional/org/jgroups/tests/HeadersTest.java M tests/junit-functional/org/jgroups/tests/IpAddressTest.java M tests/junit-functional/org/jgroups/tests/MessageSizeTest.java M tests/junit-functional/org/jgroups/tests/MessageTest.java M tests/junit-functional/org/jgroups/tests/MethodCallTest.java M tests/junit-functional/org/jgroups/tests/NakackTest.java M tests/junit-functional/org/jgroups/tests/ProgrammaticApiTest.java M tests/junit-functional/org/jgroups/tests/RspListTest.java R tests/junit-functional/org/jgroups/tests/SimulatorTest.java M tests/junit-functional/org/jgroups/tests/SizeTest.java M tests/junit-functional/org/jgroups/tests/StreamableTest.java M tests/junit-functional/org/jgroups/tests/UNICAST_Test.java R tests/junit-functional/org/jgroups/tests/UnmodifiableVectorTest.java M tests/junit-functional/org/jgroups/tests/UtilTest.java R tests/junit/org/jgroups/blocks/DistributedLockManagerTest.java M tests/junit/org/jgroups/blocks/ExecutingServiceTest.java M tests/junit/org/jgroups/blocks/RpcDispatcherAnycastServerObject.java M tests/junit/org/jgroups/blocks/RpcDispatcherAnycastTest.java M tests/junit/org/jgroups/blocks/RpcDispatcherExceptionTest.java M tests/junit/org/jgroups/blocks/RpcDispatcherInterruptTest.java M tests/junit/org/jgroups/blocks/RpcDispatcherSerializationTest.java M tests/junit/org/jgroups/blocks/RpcDispatcherTest.java M tests/junit/org/jgroups/blocks/RpcDispatcherUnicastMethodExceptionTest.java M tests/junit/org/jgroups/blocks/RpcDispatcherUnitTest.java R tests/junit/org/jgroups/blocks/VotingAdapterTest.java R tests/junit/org/jgroups/protocols/FRAG2_Test.java M tests/junit/org/jgroups/protocols/GMS_MergeTest.java R tests/junit/org/jgroups/protocols/STATE_TRANSFER_Test.java M tests/junit/org/jgroups/protocols/UNICAST_ContentionTest.java R tests/junit/org/jgroups/tests/AddDataTest.java M tests/junit/org/jgroups/tests/ChannelConcurrencyTest.java M tests/junit/org/jgroups/tests/ChannelTest.java M tests/junit/org/jgroups/tests/ChannelTestBase.java M tests/junit/org/jgroups/tests/CloseTest.java M tests/junit/org/jgroups/tests/ConcurrentCloseTest.java M tests/junit/org/jgroups/tests/ConcurrentFlushTest.java M tests/junit/org/jgroups/tests/ConcurrentStartupTest.java M tests/junit/org/jgroups/tests/Deadlock2Test.java M tests/junit/org/jgroups/tests/EncryptMessageOrderTestCase.java M tests/junit/org/jgroups/tests/FlushTest.java M tests/junit/org/jgroups/tests/LargeStateTransferTest.java M tests/junit/org/jgroups/tests/LastMessageDroppedTest.java M tests/junit/org/jgroups/tests/MergeTest.java M tests/junit/org/jgroups/tests/MessageDispatcherUnitTest.java M tests/junit/org/jgroups/tests/OOBTest.java M tests/junit/org/jgroups/tests/OverlappingMergeTest.java M tests/junit/org/jgroups/tests/OverlappingUnicastMergeTest.java M tests/junit/org/jgroups/tests/ReconciliationTest.java M tests/junit/org/jgroups/tests/ReplicatedHashMapStartupTest.java M tests/junit/org/jgroups/tests/ReplicatedHashMapTest.java M tests/junit/org/jgroups/tests/SendAndReceiveTest.java M tests/junit/org/jgroups/tests/StateTransferTest.java M tests/junit/org/jgroups/tests/TCPGOSSIP_Test.java M tests/junit/org/jgroups/tests/TUNNEL_Test2.java M tests/junit/org/jgroups/tests/UnicastEnableToTest.java R tests/junit/org/jgroups/tests/VirtualSynchronyTest.java R tests/other/org/jgroups/tests/BundlerTest.java R tests/other/org/jgroups/tests/ChannelCallbackTest.java R tests/other/org/jgroups/tests/ConnectionMapDemo.java R tests/other/org/jgroups/tests/ConnectionTableDemo_NIO.java R tests/other/org/jgroups/tests/DatagramTest.java R tests/other/org/jgroups/tests/DeadlockTest.java R tests/other/org/jgroups/tests/DiscoveryTest.java M tests/other/org/jgroups/tests/FlowControlTest.java R tests/other/org/jgroups/tests/FragTest2.java R tests/other/org/jgroups/tests/FragTestUnicast.java R tests/other/org/jgroups/tests/GetStateTest.java R tests/other/org/jgroups/tests/HashMapTest.java R tests/other/org/jgroups/tests/JmxTest.java M tests/other/org/jgroups/tests/LargeState.java R tests/other/org/jgroups/tests/LargeStateClient.java R tests/other/org/jgroups/tests/LargeStateServer.java R tests/other/org/jgroups/tests/LatencyTest.java R tests/other/org/jgroups/tests/LogTest.java M tests/other/org/jgroups/tests/McastDiscovery.java R tests/other/org/jgroups/tests/McastLoopbackTest.java M tests/other/org/jgroups/tests/McastReceiverTest.java R tests/other/org/jgroups/tests/McastReceiverTest1_4.java M tests/other/org/jgroups/tests/McastSenderTest.java R tests/other/org/jgroups/tests/McastSenderTest1_4.java M tests/other/org/jgroups/tests/MessageDispatcherSpeedTest.java R tests/other/org/jgroups/tests/MessageListStreamableTest.java R tests/other/org/jgroups/tests/NakReceiverWindowStressTest.java R tests/other/org/jgroups/tests/PerfTpTest.java M tests/other/org/jgroups/tests/RoundTrip.java M tests/other/org/jgroups/tests/RpcDispatcherBlocking.java M tests/other/org/jgroups/tests/RpcDispatcherSpeedTest.java R tests/other/org/jgroups/tests/RpcDispatcherStressTest.java R tests/other/org/jgroups/tests/StressTester.java R tests/other/org/jgroups/tests/StringTest.java R tests/other/org/jgroups/tests/SynchronousMessageSpeedTest.java R tests/other/org/jgroups/tests/TokenTest.java R tests/other/org/jgroups/tests/UcastTest.java M tests/other/org/jgroups/tests/UnicastTest.java M tests/other/org/jgroups/tests/UnicastTestRpc.java M tests/other/org/jgroups/tests/UnicastTestRpcDist.java M tests/other/org/jgroups/tests/UnicastTestSimple.java R tests/other/org/jgroups/tests/UpHandlerTest.java R tests/other/org/jgroups/tests/ViewDeliveryDemo.java M tests/perf/org/jgroups/tests/perf/Data.java M tests/perf/org/jgroups/tests/perf/MemberInfo.java R tests/perf/org/jgroups/tests/perf/PerformanceTestGenerator.java M tests/perf/org/jgroups/tests/perf/transports/JGroupsTransport.java R tests/stress/org/jgroups/tests/MessageStressTest.java R tests/stress/org/jgroups/tests/NAKACKTest2.java A tests/stress/org/jgroups/tests/NakReceiverWindowStressTest.java R tests/stress/org/jgroups/tests/NetworkUtilization.java R tests/stress/org/jgroups/tests/RingBufferStressTest.java R tests/stress/org/jgroups/tests/ScaleTest.java R tests/stress/org/jgroups/tests/UnicastContentionTest.java M tests/stress/org/jgroups/tests/UnicastStressTest.java M tests/stress/org/jgroups/tests/UnicastStressTestRpc.java Log Message: ----------- Merge branch 'master' into JGRP-1310 Conflicts: src/org/jgroups/demos/ExecutionServiceDemo.java Commit: b461f08949be9e73c4f20c47793285daea52b18e https://github.com/belaban/JGroups/commit/b461f08949be9e73c4f20c47793285daea52b18e Author: William Burns <Wil...@Re...> Date: 2011-04-16 (Sat, 16 Apr 2011) Changed paths: M .gitignore M src/org/jgroups/demos/ExecutionServiceDemo.java M src/org/jgroups/protocols/CENTRAL_EXECUTOR.java M src/org/jgroups/protocols/Executing.java Log Message: ----------- Cleaned up some stuff to not need another thread pool. Unfortunately certain requests now have to be serialized but it is better me thinks. Also fixed up compilation errors due to merge. Compare: https://github.com/belaban/JGroups/compare/872bf41...b461f08 |
