You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2017/03/13 13:52:57 UTC

[6/6] cayenne git commit: Merge branch 'CAY-1873-(2)' into asf-master

Merge branch 'CAY-1873-(2)' into asf-master


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/dfa3d87d
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/dfa3d87d
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/dfa3d87d

Branch: refs/heads/master
Commit: dfa3d87d88ee9c6eef07ec7db338f2154f86b416
Parents: 9c32b76 982b154
Author: Nikita Timofeev <st...@gmail.com>
Authored: Mon Mar 13 16:42:51 2017 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Mon Mar 13 16:42:51 2017 +0300

----------------------------------------------------------------------
 .../org/apache/cayenne/access/DataDomain.java   |  61 ++--
 .../org/apache/cayenne/access/DataRowStore.java | 215 ++++++------
 .../cayenne/access/DataRowStoreFactory.java     |  38 +++
 .../access/DefaultDataRowStoreFactory.java      |  74 ++++
 .../access/HierarchicalObjectResolver.java      |  10 +-
 .../cayenne/access/PrefetchProcessorNode.java   |  66 ++--
 .../cayenne/access/event/SnapshotEvent.java     |  40 +--
 .../apache/cayenne/configuration/Constants.java |  32 ++
 .../server/DataContextFactory.java              |  18 +-
 .../server/DataDomainProvider.java              |   2 +
 .../configuration/server/ServerModule.java      |  43 ++-
 .../cayenne/event/EventBridgeFactory.java       |   2 +-
 .../org/apache/cayenne/event/JMSBridge.java     |  35 +-
 .../apache/cayenne/event/JMSBridgeFactory.java  |  19 +-
 .../apache/cayenne/event/JMSBridgeProvider.java |  50 +++
 .../apache/cayenne/event/JavaGroupsBridge.java  |  33 +-
 .../cayenne/event/JavaGroupsBridgeFactory.java  | 109 +-----
 .../cayenne/event/JavaGroupsBridgeProvider.java |  50 +++
 .../apache/cayenne/event/NoopEventBridge.java   |  43 +++
 .../cayenne/event/NoopEventBridgeProvider.java  |  35 ++
 .../org/apache/cayenne/event/XMPPBridge.java    |  62 +++-
 .../apache/cayenne/event/XMPPBridgeFactory.java |  53 +--
 .../cayenne/event/XMPPBridgeProvider.java       |  50 +++
 .../apache/cayenne/access/DataRowStoreIT.java   |  60 +---
 .../access/DefaultDataRowStoreFactoryIT.java    | 123 +++++++
 .../apache/cayenne/access/MockDataRowStore.java |   7 +-
 .../cayenne/access/event/SnapshotEventTest.java |  10 +-
 .../server/DataContextFactoryTest.java          |  14 +
 .../server/DataDomainProviderTest.java          |   8 +
 .../cayenne/event/JGroupsBridgeFactoryTest.java |  46 ---
 .../cayenne/event/JMSBridgeFactoryTest.java     |  77 +++++
 .../cayenne/event/JMSBridgeProviderTest.java    | 119 +++++++
 .../event/JavaGroupsBridgeFactoryTest.java      |  84 +++++
 .../event/JavaGroupsBridgeProviderTest.java     | 123 +++++++
 .../cayenne/event/MockEventBridgeProvider.java  |  43 +++
 .../cayenne/event/XMPPBridgeFactoryTest.java    |  47 ++-
 .../cayenne/event/XMPPBridgeProviderTest.java   | 130 +++++++
 .../datadomain/CacheSyncConfigController.java   | 337 -------------------
 .../dialog/datadomain/CacheSyncConfigView.java  | 103 ------
 .../CustomRemoteEventsConfigPanel.java          |  58 ----
 .../dialog/datadomain/JGroupsConfigPanel.java   | 104 ------
 .../dialog/datadomain/JMSConfigPanel.java       |  58 ----
 .../cayenne/modeler/editor/DataDomainView.java  | 116 +------
 43 files changed, 1512 insertions(+), 1295 deletions(-)
----------------------------------------------------------------------