Repository: curator Updated Branches: refs/heads/CURATOR-3.0 [created] 8c8d7ec2b
Merge branch 'CURATOR-215' into CURATOR-3.0 Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/8c8d7ec2 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/8c8d7ec2 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/8c8d7ec2 Branch: refs/heads/CURATOR-3.0 Commit: 8c8d7ec2ba24cf192db7cd0a738924a2ec538e09 Parents: 0d6d82a 8389371 Author: Scott Blum <[email protected]> Authored: Wed Aug 12 17:30:01 2015 -0400 Committer: Scott Blum <[email protected]> Committed: Wed Aug 12 17:30:01 2015 -0400 ---------------------------------------------------------------------- .../java/framework/TransactionExamples.java | 50 +---- .../curator/framework/CuratorFramework.java | 21 +- .../curator/framework/api/CuratorEvent.java | 7 + .../curator/framework/api/CuratorEventType.java | 5 + .../transaction/CuratorMultiTransaction.java | 27 +++ .../CuratorMultiTransactionMain.java | 45 ++++ .../framework/api/transaction/CuratorOp.java | 31 +++ .../api/transaction/CuratorTransaction.java | 13 +- .../transaction/CuratorTransactionResult.java | 11 +- .../api/transaction/OperationType.java | 8 +- .../transaction/TransactionCheckBuilder.java | 6 +- .../transaction/TransactionCreateBuilder.java | 10 +- .../transaction/TransactionDeleteBuilder.java | 6 +- .../api/transaction/TransactionOp.java | 56 +++++ .../transaction/TransactionSetDataBuilder.java | 8 +- .../framework/api/transaction/TypeAndPath.java | 41 ++++ .../framework/imps/BackgroundSyncImpl.java | 2 +- .../framework/imps/CreateBuilderImpl.java | 19 +- .../framework/imps/CuratorEventImpl.java | 35 ++- .../framework/imps/CuratorFrameworkImpl.java | 24 +- .../imps/CuratorMultiTransactionImpl.java | 163 ++++++++++++++ .../imps/CuratorMultiTransactionRecord.java | 17 +- .../framework/imps/CuratorTransactionImpl.java | 149 +++++++------ .../framework/imps/DeleteBuilderImpl.java | 13 +- .../framework/imps/ExistsBuilderImpl.java | 2 +- .../framework/imps/ExtractingCuratorOp.java | 54 +++++ .../framework/imps/GetACLBuilderImpl.java | 2 +- .../framework/imps/GetChildrenBuilderImpl.java | 2 +- .../framework/imps/GetConfigBuilderImpl.java | 2 +- .../framework/imps/GetDataBuilderImpl.java | 2 +- .../framework/imps/ReconfigBuilderImpl.java | 2 +- .../framework/imps/SetACLBuilderImpl.java | 2 +- .../framework/imps/SetDataBuilderImpl.java | 23 +- .../curator/framework/imps/SyncBuilderImpl.java | 2 +- .../framework/imps/TransactionOpImpl.java | 65 ++++++ .../src/site/confluence/index.confluence | 4 +- .../imps/TestCompressionInTransaction.java | 157 ------------- .../imps/TestCompressionInTransactionNew.java | 162 ++++++++++++++ .../imps/TestCompressionInTransactionOld.java | 158 ++++++++++++++ .../framework/imps/TestTransactions.java | 139 ------------ .../framework/imps/TestTransactionsNew.java | 218 +++++++++++++++++++ .../framework/imps/TestTransactionsOld.java | 141 ++++++++++++ 42 files changed, 1398 insertions(+), 506 deletions(-) ----------------------------------------------------------------------
